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 rh...@apache.org on 2018/11/29 15:28:26 UTC
svn commit: r1847726 - in /db/derby/docs/trunk/src:
adminguide/tadminovclirun.dita adminguide/tadminovnsrundemo.dita
getstart/twwdactivity1.dita getstart/twwdactivity2.dita
getstart/twwdactivity3_Setup.dita getstart/twwdactivity4.dita
Author: rhillegas
Date: Thu Nov 29 15:28:26 2018
New Revision: 1847726
URL: http://svn.apache.org/viewvc?rev=1847726&view=rev
Log:
DERBY-6980: Update documentation on sample programs to recommend the correct classpaths; commit derby-6980-14-aa-samplePrograms.diff.
Modified:
db/derby/docs/trunk/src/adminguide/tadminovclirun.dita
db/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita
db/derby/docs/trunk/src/getstart/twwdactivity1.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
Modified: db/derby/docs/trunk/src/adminguide/tadminovclirun.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadminovclirun.dita?rev=1847726&r1=1847725&r2=1847726&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadminovclirun.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadminovclirun.dita Thu Nov 29 15:28:26 2018
@@ -36,6 +36,7 @@ is the directory where you installed
<li>The current directory (".")</li>
<li><codeph>derbyclient.jar</codeph></li>
<li><codeph>derbyshared.jar</codeph></li>
+<li><codeph>derbytools.jar</codeph></li>
</ul></info></step>
<step><cmd>After you set up your environment correctly, run the
<codeph>SimpleNetworkClientSample</codeph> program from the same
Modified: db/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita?rev=1847726&r1=1847725&r2=1847726&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita Thu Nov 29 15:28:26 2018
@@ -33,19 +33,37 @@ the directory where you installed
<step><cmd>Set the CLASSPATH to the current directory ("."), and also include
the following jar files in order to use the Network Server and the network
client driver:</cmd>
-<info><dl><dlentry>
+<info><dl>
+
+<dlentry>
<dt><codeph>derbynet.jar</codeph></dt>
<dd>The Network Server jar file. It must be in your CLASSPATH to use any of
the Network Server functions.</dd>
-</dlentry><dlentry>
+</dlentry>
+
+<dlentry>
<dt><codeph>derbyclient.jar</codeph></dt>
<dd>This jar file must be in your CLASSPATH to use the Network Client
driver.</dd>
-</dlentry><dlentry>
+</dlentry>
+
+<dlentry>
<dt><codeph>derby.jar</codeph></dt>
<dd>The <ph conref="../conrefs.dita#prod/productshortname"></ph> database
engine jar file.</dd>
-</dlentry></dl></info></step>
+</dlentry>
+
+<dlentry>
+<dt><codeph>derbyshared.jar</codeph></dt>
+<dd>Code shared by all <ph conref="../conrefs.dita#prod/productshortname"></ph> configurations.</dd>
+</dlentry>
+
+<dlentry>
+<dt><codeph>derbytools.jar</codeph></dt>
+<dd><ph conref="../conrefs.dita#prod/productshortname"></ph> DataSources and tools.</dd>
+</dlentry>
+
+</dl></info></step>
<step><cmd>Test the CLASSPATH settings by running the following Java
command:</cmd>
<stepxmp>
Modified: db/derby/docs/trunk/src/getstart/twwdactivity1.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/twwdactivity1.dita?rev=1847726&r1=1847725&r2=1847726&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/twwdactivity1.dita (original)
+++ db/derby/docs/trunk/src/getstart/twwdactivity1.dita Thu Nov 29 15:28:26 2018
@@ -154,28 +154,23 @@ ij> insert into COUNTRIES values ( 'Alba
log that, under normal circumstances, contains a set of startup messages and
a shutdown message.
<codeblock><systemoutput>----------------------------------------------------------------
-Thu Sep 13 09:52:15 EDT 2012:
-Booting Derby version The Apache Software Foundation - Apache
- Derby - 10.10.0.0 - (1384314):
- instance a816c00e-0139-bfe6-bff8-000000a155b8
-on database directory C:\DERBYTUTOR\firstdb
- with class loader sun.misc.Launcher$AppClassLoader@9931f5
-Loaded from file:C:\db-derby-10.10.0.0-bin\lib\derby.jar
+Wed Nov 28 09:52:36 PST 2018:
+Booting Derby version The Apache Software Foundation - Apache Derby - 10.15.0.0 alpha - (1847657M): instance a816c00e-0167-5b73-7c80-0000033b46b8
+on database directory /Users/rhillegas/sw/z/activity1/DERBYTUTOR/firstdb with class loader jdk.internal.loader.ClassLoaders$AppClassLoader@4f8e5cde
+Loaded from file:/Users/rhillegas/sw/z/db-derby-10.15.0.0-bin/lib/derby.jar
java.vendor=Oracle Corporation
-java.runtime.version=1.7.0_07-b11
-user.dir=C:\DERBYTUTOR
-os.name=Windows XP
-os.arch=x86
-os.version=5.1
-derby.system.home=C:\DERBYTUTOR
+java.runtime.version=9+181
+user.dir=/Users/rhillegas/sw/z/activity1/DERBYTUTOR
+os.name=Mac OS X
+os.arch=x86_64
+os.version=10.11.6
+derby.system.home=null
Database Class Loader started - derby.database.classpath=''
----------------------------------------------------------------
-Thu Sep 13 09:53:21 EDT 2012: Shutting down Derby engine
+Wed Nov 28 09:55:14 PST 2018: Shutting down Derby engine
----------------------------------------------------------------
-Thu Sep 13 09:53:21 EDT 2012:
-Shutting down instance a816c00e-0139-bfe6-bff8-000000a155b8 on
- database directory C:\DERBYTUTOR\firstdb
- with class loader sun.misc.Launcher$AppClassLoader@9931f5
+Wed Nov 28 09:55:14 PST 2018:
+Shutting down instance a816c00e-0167-5b73-7c80-0000033b46b8 on database directory /Users/rhillegas/sw/z/activity1/DERBYTUTOR/firstdb with class loader jdk.internal.loader.ClassLoaders$AppClassLoader@4f8e5cde
----------------------------------------------------------------</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/trunk/src/getstart/twwdactivity2.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/twwdactivity2.dita?rev=1847726&r1=1847725&r2=1847726&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/twwdactivity2.dita (original)
+++ db/derby/docs/trunk/src/getstart/twwdactivity2.dita Thu Nov 29 15:28:26 2018
@@ -57,20 +57,14 @@ 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>Thu Sep 13 16:45:36 EDT 2012 : Security manager
- installed using the Basic server security policy.
-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>
+<systemoutput>Wed Nov 28 10:08:29 PST 2018 : Security manager installed using the Basic server security policy.
+Wed Nov 28 10:08:37 PST 2018 : Apache Derby Network Server - 10.15.0.0 alpha - (1847657M) 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>Thu Sep 13 16:45:36 EDT 2012 : Security manager
- installed using the Basic server security policy.
-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>
+<systemoutput>Wed Nov 28 10:08:29 PST 2018 : Security manager installed using the Basic server security policy.
+Wed Nov 28 10:08:37 PST 2018 : Apache Derby Network Server - 10.15.0.0 alpha - (1847657M) started and ready to accept connections on port 1527</systemoutput></codeblock></entry>
</row>
</tbody>
</tgroup>
@@ -163,14 +157,12 @@ 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>Thu Sep 13 16:50:37 EDT 2012 : Apache Derby
- Network Server - 10.10.0.0 - (1384314) shutdown</systemoutput></codeblock></entry>
+<systemoutput>Wed Nov 28 10:15:54 PST 2018 : Apache Derby Network Server - 10.15.0.0 alpha - (1847657M) 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>Thu Sep 13 16:50:37 EDT 2012 : Apache Derby
- Network Server - 10.10.0.0 - (1384314) shutdown</systemoutput></codeblock></entry>
+<systemoutput>Wed Nov 28 10:15:54 PST 2018 : Apache Derby Network Server - 10.15.0.0 alpha - (1847657M) 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=1847726&r1=1847725&r2=1847726&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/twwdactivity3_Setup.dita (original)
+++ db/derby/docs/trunk/src/getstart/twwdactivity3_Setup.dita Thu Nov 29 15:28:26 2018
@@ -62,13 +62,13 @@ environment variable</title>
<entry colname="col1">UNIX (Korn Shell)</entry>
<entry colname="col2"><codeblock><b><userinput>cp $DERBY_HOME/demo/programs/workingwithderby/* .
-export CLASSPATH=$DERBY_HOME/lib/derby.jar:.</userinput></b></codeblock></entry>
+export CLASSPATH=$DERBY_HOME/lib/derby.jar:$DERBY_HOME/lib/derbyshared.jar:.</userinput></b></codeblock></entry>
</row>
<row>
<entry colname="col1">Windows</entry>
<entry colname="col2"><codeblock><b><userinput>copy %DERBY_HOME%\demo\programs\workingwithderby\* .
-set CLASSPATH=%DERBY_HOME%\lib\derby.jar;.</userinput></b></codeblock></entry>
+set CLASSPATH=%DERBY_HOME%\lib\derby.jar;%DERBY_HOME%\lib\derbyshared.jar;.</userinput></b></codeblock></entry>
</row>
</tbody>
</tgroup>
Modified: db/derby/docs/trunk/src/getstart/twwdactivity4.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/twwdactivity4.dita?rev=1847726&r1=1847725&r2=1847726&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/twwdactivity4.dita (original)
+++ db/derby/docs/trunk/src/getstart/twwdactivity4.dita Thu Nov 29 15:28:26 2018
@@ -140,22 +140,14 @@ 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>
-Fri Sep 14 09:55:23 EDT 2012 : Security
- manager installed using the Basic server
- security policy.
-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>
+Wed Nov 28 13:21:31 PST 2018 : Security manager installed using the Basic server security policy.
+Wed Nov 28 13:21:39 PST 2018 : Apache Derby Network Server - 10.15.0.0 alpha - (1847657M) 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>
-Fri Sep 14 09:55:23 EDT 2012 : Security
- manager installed using the Basic server
- security policy.
-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>
+Wed Nov 28 13:21:31 PST 2018 : Security manager installed using the Basic server security policy.
+Wed Nov 28 13:21:39 PST 2018 : Apache Derby Network Server - 10.15.0.0 alpha - (1847657M) started and ready to accept connections on port 1527</codeblock></entry>
</row>
</tbody>
</tgroup>
@@ -187,12 +179,12 @@ variable</title>
<tbody>
<row>
<entry colname="col1">UNIX (Korn Shell)</entry>
-<entry colname="col2"><codeblock><b><userinput>export CLASSPATH=$DERBY_HOME/lib/derbyclient.jar:.</userinput></b></codeblock>
+<entry colname="col2"><codeblock><b><userinput>export CLASSPATH=$DERBY_HOME/lib/derbyclient.jar:$DERBY_HOME/lib/derbyshared.jar:.</userinput></b></codeblock>
</entry>
</row>
<row>
<entry colname="col1">Windows</entry>
-<entry colname="col2"><codeblock><b><userinput>set CLASSPATH=%DERBY_HOME%\lib\derbyclient.jar;.</userinput></b></codeblock>
+<entry colname="col2"><codeblock><b><userinput>set CLASSPATH=%DERBY_HOME%\lib\derbyclient.jar;%DERBY_HOME%\lib\derbyshared.jar;.</userinput></b></codeblock>
</entry>
</row>
</tbody>
@@ -244,14 +236,12 @@ 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>Fri Sep 14 09:58:12 EDT 2012 : Apache Derby
- Network Server - 10.10.0.0 - (1384314) shutdown</systemoutput></codeblock></entry>
+<systemoutput>Wed Nov 28 13:28:12 PST 2018 : Apache Derby Network Server - 10.15.0.0 alpha - (1847657M) 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>Fri Sep 14 09:58:12 EDT 2012 : Apache Derby
- Network Server - 10.10.0.0 - (1384314) shutdown</systemoutput></codeblock></entry>
+<systemoutput>Wed Nov 28 13:28:12 PST 2018 : Apache Derby Network Server - 10.15.0.0 alpha - (1847657M) shutdown</systemoutput></codeblock></entry>
</row>
</tbody>
</tgroup>