db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r652532 - in /db/derby/site/trunk: build/site/papers/DerbyTut/ src/documentation/content/xdocs/papers/DerbyTut/
Date Thu, 01 May 2008 14:26:06 GMT
Author: kmarsden
Date: Thu May  1 07:26:06 2008
New Revision: 652532

URL: http://svn.apache.org/viewvc?rev=652532&view=rev
Log:
DERBY-3642 Update and rectify the Derby tutorial

Contributed by Suran Jayathilaka (suranjay at gmail dot com)

Modified:
    db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.html
    db/derby/site/trunk/build/site/papers/DerbyTut/ij_intro.html
    db/derby/site/trunk/build/site/papers/DerbyTut/index.html
    db/derby/site/trunk/build/site/papers/DerbyTut/install_software.html
    db/derby/site/trunk/build/site/papers/DerbyTut/ns_intro.html
    db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/embedded_intro.xml
    db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/ij_intro.xml
    db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/install_software.xml
    db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/ns_intro.xml

Modified: db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.html
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.html?rev=652532&r1=652531&r2=652532&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.html Thu May  1 07:26:06
2008
@@ -409,7 +409,7 @@
 <p>
    The Derby software includes a sample application called 
    <span class="codefrag">SimpleApp.java</span>.
-   In Derby 10.2 it is located in the
+   In Derby 10.2 and above it is located in the
    <span class="codefrag">DERBY_INSTALL/demo/programs/simple/</span> directory.
    (In Derby 10.1 it is located in the
    <span class="codefrag">DERBY_INSTALL/demo/simple/</span> directory.)
@@ -499,7 +499,8 @@
    Compile the sample application as shown below:
    </p>
 <p class="code-block">javac SimpleApp.java</p>
-<a name="N100DF"></a><a name="run_sample_app"></a>
+<p>You can safely ignore any compile warnings that might pop up.</p>
+<a name="N100E2"></a><a name="run_sample_app"></a>
 <h3 class="boxed">Run sample application</h3>
 <p>
    Run the sample application like this:
@@ -551,7 +552,7 @@
 </div>
 
 
-<a name="N10107"></a><a name="just_one_app"></a>
+<a name="N1010A"></a><a name="just_one_app"></a>
 <h2 class="boxed">Embedded Derby supports multiple users in one JVM</h2>
 <div class="section">
 <p>
@@ -574,7 +575,7 @@
 <span class="codefrag">ij</span> as shown below:
 </p>
 <p class="code-block">java org.apache.derby.tools.ij
-ij version 10.1
+ij version 10.4
 ij&gt; connect 'jdbc:derby:derbyDB';
 ij&gt;
 </p>
@@ -588,11 +589,18 @@
 
 
 <p class="code-block">java SimpleApp
-SimpleApp starting in embedded mode.
-Loaded the appropriate driver.
-exception thrown:
-SQL Exception: Failed to start database 'derbyDB', see the next exception for details.
-SQL Exception: Another instance of Derby may have already booted the database /home/jta/databases/sample_app/derbyDB.
+SimpleApp starting in embedded mode
+Loaded the appropriate driver
+
+----- SQLException -----
+  SQL State:  XJ040
+  Error Code: 40000
+  Message:    Failed to start database 'derbyDB', see the next exception for details.
+
+----- SQLException -----
+  SQL State:  XSDB6
+  Error Code: 45000
+  Message:    Another instance of Derby may have already booted the database C:\Apache\db-derby-10.4.1.3-bin\tutorial\derbyDB.
 SimpleApp finished
 </p>
 

Modified: db/derby/site/trunk/build/site/papers/DerbyTut/ij_intro.html
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/build/site/papers/DerbyTut/ij_intro.html?rev=652532&r1=652531&r2=652532&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyTut/ij_intro.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyTut/ij_intro.html Thu May  1 07:26:06 2008
@@ -366,7 +366,7 @@
 <p>
 This section uses the Derby Embedded JDBC driver to introduce a few 
 <span class="codefrag">ij</span> features.
-The information presented here is minimal, just enough to get started.
+The information presented here is minimal, just enough to get you started.
 For a more complete introduction, see the
 <a href="http://db.apache.org/derby/docs/dev/tools/ctoolsij32837.html">Getting
 started with ij</a> section
@@ -394,7 +394,7 @@
 <p>Start up <span class="codefrag">ij</span> with this command:</p>
 <p class="code-block">java org.apache.derby.tools.ij</p>
 <p>You should see the output shown below:</p>
-<p class="code-block">ij version 10.1
+<p class="code-block">ij version 10.4
 ij&gt;
 </p>
 <p>
@@ -425,7 +425,7 @@
 </p>
 <p class="code-block">ij&gt; connect 'jdbc:derby:MyDbTest;create=true';</p>
 <p>
-Now quit out of <span class="codefrag">ij</span>:
+Now exit <span class="codefrag">ij</span>:
 </p>
 <p class="code-block">ij&gt; exit; </p>
 <p>

Modified: db/derby/site/trunk/build/site/papers/DerbyTut/index.html
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/build/site/papers/DerbyTut/index.html?rev=652532&r1=652531&r2=652532&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyTut/index.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyTut/index.html Thu May  1 07:26:06 2008
@@ -529,7 +529,7 @@
 
 
 <p>
-<em>Last updated: March 20, 2006</em>
+<em>Last updated: April 30, 2008</em>
 </p>
 
 </div>

Modified: db/derby/site/trunk/build/site/papers/DerbyTut/install_software.html
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/build/site/papers/DerbyTut/install_software.html?rev=652532&r1=652531&r2=652532&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyTut/install_software.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyTut/install_software.html Thu May  1 07:26:06
2008
@@ -380,8 +380,8 @@
 <a name="N10020"></a><a name="jdk"></a>
 <h2 class="boxed">Java Development Kit (JDK)</h2>
 <div class="section">
-<p>Derby requires Java 2 Standard Edition (J2SE) 1.3 or higher
-(this tutorial was developed using JDK 1.4.2).
+<p>Derby requires Java 2 Standard Edition (J2SE) 1.4.2 or higher
+(this tutorial was developed using JDK 1.5).
 Only the Java Runtime Environment (JRE) is required to run Derby,
 but this tutorial compiles a Java application, so it requires
 the Java Development Kit (JDK).
@@ -398,7 +398,7 @@
 If you have not already installed a JDK,
 download and install it now. 
 No specific vendor implementation is required;
-the only requirement is that it be certified for J2SE 1.3 or higher.
+the only requirement is that it be certified for J2SE 1.4.2 or higher.
 Java's reference implementation is at
 <a class="external" href="http://java.sun.com/j2se/">http://java.sun.com/j2se/</a>.
 After installing the JDK of your choice, proceed to the next section.
@@ -409,15 +409,16 @@
 Set the <span class="codefrag">JAVA_HOME</span> environment variable to the root
location of
 the JDK installation directory.
 The examples below use
-<span class="codefrag">C:\jdk1.4</span> for Windows and 
-<span class="codefrag">/opt/jdk1.4</span> for UNIX, but be sure to use the actual
-location on your system.
+<span class="codefrag">C:\jdk1.5</span> for Windows and 
+<span class="codefrag">/opt/jdk1.5</span> for UNIX, but be sure to use the actual
+location on your system. (e.g. The default installation location used by the JDK 
+installer might be something like C:\Program Files\Java\jdk1.5.0_06)
 </p>
 <p class="code-block">Windows:
-C:\&gt; set JAVA_HOME=C:\jdk1.4
+C:\&gt; set JAVA_HOME=C:\jdk1.5
 </p>
 <p class="code-block">UNIX Korn Shell:
-$ export JAVA_HOME=/opt/jdk1.4
+$ export JAVA_HOME=/opt/jdk1.5
 </p>
 <p>
 Next set the <span class="codefrag">PATH</span> environment variable to include
the JDK
@@ -428,19 +429,20 @@
 <p class="code-block">Windows:
 C:\&gt; set PATH=%PATH%;%JAVA_HOME%\bin
 </p>
+<p>In Windows, these envoronment variables can also be set from - right click "My Computer"
-&gt; Advanced -&gt; Environment Variables.</p>
 <p class="code-block">UNIX Korn Shell:
 $ export PATH=$JAVA_HOME/bin:$PATH
 </p>
-<a name="N10077"></a><a name="jdk_verify"></a>
+<a name="N1007A"></a><a name="jdk_verify"></a>
 <h3 class="boxed">Verify JDK</h3>
 <p>
 Use the <span class="codefrag">java -version</span> command, as shown below,
 to verify the installed release:
 </p>
 <p class="code-block">java -version
-java version "1.4.2_04"
-Java(TM) 2 Runtime Environment, Standard Edition (build 1.4.2_04-b05)
-Java HotSpot(TM) Client VM (build 1.4.2_04-b05, mixed mode)
+java version "1.5.0_06"
+Java(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_06-b05)
+Java HotSpot(TM) Client VM (build 1.5.0_06-b05, mixed mode, sharing)
 </p>
 <p>
 The output you see may be different from what is shown above because
@@ -452,15 +454,15 @@
 </div>
 
 
-<a name="N10092"></a><a name="derby"></a>
+<a name="N10095"></a><a name="derby"></a>
 <h2 class="boxed">Apache Derby</h2>
 <div class="section">
-<a name="N10098"></a><a name="derby_download"></a>
+<a name="N1009B"></a><a name="derby_download"></a>
 <h3 class="boxed">Download Derby</h3>
 <p>
 Download the binary Apache Derby distribution from the Derby web site at 
 <a href="http://db.apache.org/derby/derby_downloads.html">http://db.apache.org/derby/derby_downloads.html</a>.
-These tutorial instructions use version 10.1.2.1 and 
+These tutorial instructions use version 10.4.1.3 and 
 assume you downloaded one of the binary distribution files 
 listed in the table below:
 </p>
@@ -471,19 +473,19 @@
 </tr>
      
 <tr>
-<td colspan="1" rowspan="1">Windows</td><td colspan="1" rowspan="1">db-derby-10.1.2.1-bin.zip</td>
+<td colspan="1" rowspan="1">Windows</td><td colspan="1" rowspan="1">db-derby-10.4.1.3-bin.zip</td>
 </tr>
      
 <tr>
-<td colspan="1" rowspan="1">UNIX, Linux, and Mac</td><td colspan="1" rowspan="1">db-derby-10.1.2.1-bin.tar.gz</td>
+<td colspan="1" rowspan="1">UNIX, Linux, and Mac</td><td colspan="1" rowspan="1">db-derby-10.4.1.3-bin.tar.gz</td>
 </tr>
 
 </table>
 <p>If a more recent release is available, download that,
    then substitute that version number 
-for <span class="codefrag">10.1.2.1</span> in the following instructions.
+for <span class="codefrag">10.4.1.3</span> in the following instructions.
    </p>
-<a name="N100CD"></a><a name="derby_install"></a>
+<a name="N100D0"></a><a name="derby_install"></a>
 <h3 class="boxed">Install Derby</h3>
 <p>
     Choose the directory into which you want to install the Derby software.
@@ -493,22 +495,22 @@
     Copy the software distribution to the location you choose, then
     extract it as shown below.
     </p>
-<p class="code-block">Windows (use your extraction tool -- these instructions show
mks unzip):
+<p class="code-block">Windows (use your extraction tool e.g. WinZip -- these instructions
use mks unzip):
 mkdir C:\Apache
-copy db-derby-10.1.2.1-bin.zip C:\Apache
+copy db-derby-10.4.1.3-bin.zip C:\Apache
 cd C:\Apache
-unzip db-derby-10.1.2.1-bin.zip
+unzip db-derby-10.4.1.3-bin.zip
 </p>
 <p class="code-block">UNIX:
 mkdir /opt/Apache
-cp db-derby-10.1.2.1-bin.tar.gz /opt/Apache
+cp db-derby-10.4.1.3-bin.tar.gz /opt/Apache
 cd /opt/Apache
-tar xzvf db-derby-10.1.2.1-bin.tar.gz
+tar xzvf db-derby-10.4.1.3-bin.tar.gz
 </p>
 <p>In both cases, the software will now be extracted into a subdirectory
-    named <span class="codefrag">db-derby-10.1.2.1-bin</span>. 
+    named <span class="codefrag">db-derby-10.4.1.3-bin</span>. 
    </p>
-<a name="N100EB"></a><a name="set_derby_install"></a>
+<a name="N100EE"></a><a name="set_derby_install"></a>
 <h3 class="boxed">Set DERBY_INSTALL</h3>
 <p>
 Set the <span class="codefrag">DERBY_INSTALL</span> variable to the location
where you
@@ -517,12 +519,12 @@
 your system:
 </p>
 <p class="code-block">Windows:
-C:\&gt; set DERBY_INSTALL=C:\Apache\db-derby-10.1.2.1-bin
+C:\&gt; set DERBY_INSTALL=C:\Apache\db-derby-10.4.1.3-bin
 </p>
 <p class="code-block">UNIX Korn Shell:
-$ export DERBY_INSTALL=/opt/Apache/db-derby-10.1.2.1-bin
+$ export DERBY_INSTALL=/opt/Apache/db-derby-10.4.1.3-bin
 </p>
-<a name="N10100"></a><a name="derby_configure"></a>
+<a name="N10103"></a><a name="derby_configure"></a>
 <h3 class="boxed">Configure Embedded Derby</h3>
 <p>To use Derby in its embedded mode
       set your <span class="codefrag">CLASSPATH</span> to include the jar files
listed below:</p>
@@ -535,7 +537,7 @@
 <li> 
 <span class="codefrag">derbytools.jar</span>:
            optional, provides the <span class="codefrag">ij</span> tool that
is used
-          by a couple sections in this tutorial</li>
+          by a couple of sections in this tutorial</li>
 
 </ul>
 <p>
@@ -561,7 +563,7 @@
 </p>
 <p>
    Change directory now into the
-   <span class="codefrag">DERBY_INSTALL/frameworks/embedded/bin</span> directory.
+   <span class="codefrag">DERBY_INSTALL/bin</span> directory.
     The <span class="codefrag">setEmbeddedCP.bat</span> (Windows) 
     and <span class="codefrag">setEmbeddedCP.ksh</span>
      (UNIX) scripts use the <span class="codefrag">DERBY_INSTALL</span> variable
to set the 
@@ -575,14 +577,14 @@
      so go ahead and execute it as shown below:
    </p>
 <p class="code-block">Windows:
-C:\&gt; cd %DERBY_INSTALL%\frameworks\embedded\bin
-C:\Apache\db-derby-10.1.2.1-bin\frameworks\embedded\bin&gt; setEmbeddedCP.bat
+C:\&gt; cd %DERBY_INSTALL%\bin
+C:\Apache\db-derby-10.4.1.3-bin\bin&gt; setEmbeddedCP.bat
 </p>
 <p class="code-block">UNIX:
-$ cd $DERBY_INSTALL/frameworks/embedded/bin
+$ cd $DERBY_INSTALL/bin
 $ . setEmbeddedCP.ksh
 </p>
-<a name="N10160"></a><a name="derby_verify"></a>
+<a name="N10163"></a><a name="derby_verify"></a>
 <h3 class="boxed">Verify Derby</h3>
 <p>Run the <span class="codefrag">sysinfo</span> command, as shown below,
to output Derby
 system information:
@@ -590,29 +592,36 @@
 <p class="code-block">java org.apache.derby.tools.sysinfo</p>
 <p>Successful output will look something like this:</p>
 <p class="code-block">------------------ Java Information ------------------
-Java Version:    1.4.2_06
+Java Version:    1.5.0_06
 Java Vendor:     Sun Microsystems Inc.
-Java home:       /opt/jdk1.4
-Java classpath:  /opt/Apache/db-derby-10.1.2.1-bin/lib/derby.jar:/opt/Apache/db-derby-10.1.2.1-bin/lib/derbytools.jar:
-OS name:         Linux
-OS architecture: i386
-OS version:      2.6.10-1.760_FC3
-Java user name:  jta
-Java user home:  /home/jta
-Java user dir:   /opt/Apache/db-derby-10.1.2.1-bin/frameworks/embedded/bin
+Java home:       C:\jdk1.5
+Java classpath:  C:\Apache\DB-DER~1.3-B\lib\derby.jar;C:\Apache\DB-DER~1.3-B\lib\derbytools.jar;
+OS name:         Windows XP
+OS architecture: x86
+OS version:      5.1
+Java user name:  user
+Java user home:  C:\Documents and Settings\user
+Java user dir:   C:\Apache\db-derby-10.4.1.3-bin\bin
 java.specification.name: Java Platform API Specification
-java.specification.version: 1.4
+java.specification.version: 1.5
 --------- Derby Information --------
-JRE - JDBC: J2SE 1.4.2 - JDBC 3.0
-[/opt/Apache/db-derby-10.1.2.1-bin/lib/derby.jar] 10.1.2.1 - (330608)
-[/opt/Apache/db-derby-10.1.2.1-bin/lib/derbytools.jar] 10.1.2.1 - (330608)
+JRE - JDBC: J2SE 5.0 - JDBC 3.0
+[C:\Apache\db-derby-10.4.1.3-bin\lib\derby.jar] 10.4.1.3 - (648739)
+[C:\Apache\db-derby-10.4.1.3-bin\lib\derbytools.jar] 10.4.1.3 - (648739)
 ------------------------------------------------------
 ----------------- Locale Information -----------------
+Current Locale :  [English/United States [en_US]]
+Found support for locale: [cs]
+.
+.
+.
+Found support for locale: [zh_TW]
+         version: 10.4.1.3 - (648739)
 ------------------------------------------------------
 </p>
 <p>
 The output on your system will probably be somewhat different 
-than the output shown above, 
+from the output shown above, 
 but it should reflect the correct location 
 of jar files on your machine and there shouldn't be any errors. 
 If you see an error like the one below, 
@@ -629,11 +638,11 @@
 </p>
 <p class="code-block">Windows:
 C:\&gt; echo %CLASSPATH% 
-C:\Apache\DB-DER~1.1-B\lib\derby.jar;C:\Apache\DB-DER~1.1-B\lib\derbytools.jar;
+C:\Apache\DB-DER~1.3-B\lib\derby.jar;C:\Apache\DB-DER~1.3-B\lib\derbytools.jar;
 </p>
 <p class="code-block">UNIX:
 $ echo $CLASSPATH
-/opt/Apache/db-derby-10.1.2.1-bin/lib/derby.jar:/opt/Apache/db-derby-10.1.2.1-bin/lib/derbytools.jar:
+/opt/Apache/db-derby-10.4.1.3-bin/lib/derby.jar:/opt/Apache/db-derby-10.4.1.3-bin/lib/derbytools.jar:
 </p>
 <p>
 If <span class="codefrag">sysinfo</span> outputs valid information, you're

Modified: db/derby/site/trunk/build/site/papers/DerbyTut/ns_intro.html
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/build/site/papers/DerbyTut/ns_intro.html?rev=652532&r1=652531&r2=652532&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyTut/ns_intro.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyTut/ns_intro.html Thu May  1 07:26:06 2008
@@ -443,6 +443,10 @@
 <span class="codefrag">derbynet.jar</span>: contains the code for
    the Derby Network Server
      </li>
+	 
+<li>
+<span class="codefrag">derbytools.jar</span>: contains Derby tools
+     </li>
 
 </ul>
 <p>
@@ -459,20 +463,20 @@
    You can also use the script that the Derby software distribution provides 
    to set <span class="codefrag">CLASSPATH</span>.
    Change directory to the
-   <span class="codefrag">DERBY_INSTALL/frameworks/NetworkServer/bin</span> directory,
+   <span class="codefrag">DERBY_INSTALL/bin</span> directory,
     then execute
    <span class="codefrag">setNetworkServerCP.bat</span> (Windows) or
      <span class="codefrag">setNetworkServerCP.ksh</span> (UNIX), as shown below:
    </p>
 <p class="code-block">Windows:
-C:\&gt; cd %DERBY_INSTALL%\frameworks\NetworkServer\bin
-C:\Apache\db-derby-10.1.2.1-bin\frameworks\NetworkServer\bin&gt; setNetworkServerCP.bat
+C:\&gt; cd %DERBY_INSTALL%\bin
+C:\Apache\db-derby-10.4.1.3-bin\bin&gt; setNetworkServerCP.bat
 </p>
 <p class="code-block">UNIX:
-$ cd $DERBY_INSTALL/frameworks/NetworkServer/bin
+$ cd $DERBY_INSTALL/bin
 $ . setNetworkServerCP.ksh
 </p>
-<a name="N10083"></a><a name="start_ns"></a>
+<a name="N10088"></a><a name="start_ns"></a>
 <h3 class="boxed">Start Network Server</h3>
 <p>
 Start the Network server by executing the
@@ -482,12 +486,16 @@
 message:
 </p>
 <p class="code-block">Windows:
-C:\Apache\db-derby-10.1.2.1-bin\frameworks\NetworkServer\bin&gt; startNetworkServer.bat
-Server is ready to accept connections on port 1527.
+C:\Apache\db-derby-10.4.1.3-bin\bin&gt; startNetworkServer.bat
+Security manager installed using the Basic server security policy.
+Apache Derby Network Server - 10.4.1.3 - (648739) started and ready to 
+	accept connections on port 1527 at 2008-04-28 17:13:13.921 GMT
 </p>
 <p class="code-block">UNIX:
 $ startNetworkServer.ksh
-Server is ready to accept connections on port 1527.
+Security manager installed using the Basic server security policy.
+Apache Derby Network Server - 10.4.1.3 - (648739) started and ready to 
+	accept connections on port 1527 at 2008-04-30 09:35:55.871 GMT 
 </p>
 <p>
 Messages will continue to be output to this window as the Network Server
@@ -500,7 +508,7 @@
 </div>
 
 
-<a name="N100A5"></a><a name="ns_sample"></a>
+<a name="N100AA"></a><a name="ns_sample"></a>
 <h2 class="boxed">Sample Application</h2>
 <div class="section">
 <p>
@@ -508,7 +516,7 @@
    <a href="install_software.html#set_derby_install">DERBY_INSTALL</a>
    environment variable.
 </p>
-<a name="N100B2"></a><a name="configure_ns_client"></a>
+<a name="N100B7"></a><a name="configure_ns_client"></a>
 <h3 class="boxed">Configure environment to use Derby Network Client JDBC driver</h3>
 <p>To use the Derby Network Client JDBC driver,
       set your <span class="codefrag">CLASSPATH</span> to include the jar files
listed below:</p>
@@ -537,18 +545,18 @@
    You can also use the script that the Derby software distribution provides 
    to set <span class="codefrag">CLASSPATH</span>.
    Change directory to the
-   <span class="codefrag">DERBY_INSTALL/frameworks/NetworkServer/bin</span> directory,
+   <span class="codefrag">DERBY_INSTALL/bin</span> directory,
     then execute
     the <span class="codefrag">setNetworkClientCP.bat</span> (Windows) or
      <span class="codefrag">setNetworkClientCP.ksh</span> (UNIX) script as shown
below:
     </p>
 <p class="code-block">Windows:
-C:\Apache\db-derby-10.1.2.1-bin\frameworks\NetworkServer\bin&gt; setNetworkClientCP.bat
+C:\Apache\db-derby-10.4.1.3-bin\bin&gt; setNetworkClientCP.bat
 </p>
 <p class="code-block">UNIX:
 $ . setNetworkClientCP.ksh
 </p>
-<a name="N100F6"></a><a name="ij_ns_client"></a>
+<a name="N100FB"></a><a name="ij_ns_client"></a>
 <h3 class="boxed">Test network server connection with ij</h3>
 <p>
    An <strong>embedded</strong> 
@@ -564,7 +572,7 @@
 <p class="code-block">java org.apache.derby.tools.ij
 ij&gt; connect 'jdbc:derby://localhost:1527/MyDbTest;create=true';</p>
 <p>
-   Where is the physical location of the newly created database?
+   What is the physical location of the newly created database?
    </p>
 <p>
    If you use the embedded driver, by default the database is created
@@ -573,7 +581,7 @@
    by default the database is created
    in the directory where the Network Server was started up; 
    in other words, in
-   <span class="codefrag">DERBY_INSTALL/frameworks/NetworkServer/bin</span>.
+   <span class="codefrag">DERBY_INSTALL/bin</span>.
    </p>
 <p>
    Derby provides many ways to specify the actual location.
@@ -597,7 +605,7 @@
 </li>
    
 </ul>
-<a name="N10138"></a><a name="copy_ns_client"></a>
+<a name="N1013D"></a><a name="copy_ns_client"></a>
 <h3 class="boxed">Copy sample application</h3>
 <p>
    This section uses the same sample application that the 
@@ -610,7 +618,7 @@
    create and connect to the database using the Derby Network Client JDBC
    driver instead.
    </p>
-<a name="N1014C"></a><a name="ns_lookat_code"></a>
+<a name="N10151"></a><a name="ns_lookat_code"></a>
 <h3 class="boxed">A quick look at the code</h3>
 <p>
    The <span class="codefrag">SimpleApp.java</span> application spends most of
its time
@@ -621,7 +629,7 @@
    The "<a href="embedded_intro.html#em_lookat_code">Embedded Derby</a>"
    section shows how to turn the same code into an embedded application.
    </p>
-<a name="N1015C"></a><a name="jdbc_ns_client"></a>
+<a name="N10161"></a><a name="jdbc_ns_client"></a>
 <h4>Load the Client JDBC Driver</h4>
 <p>
    When executed with the <span class="codefrag">derbyclient</span> argument,
@@ -632,7 +640,7 @@
 ...
 Class.forName(driver).newInstance();
 </p>
-<a name="N10170"></a><a name="url_ns_client"></a>
+<a name="N10175"></a><a name="url_ns_client"></a>
 <h4>Get a Network Server Connection</h4>
 <p>
    When executed with the <span class="codefrag">derbyclient</span> argument,
@@ -647,7 +655,7 @@
    That connection URL, fully constructed, looks like this:
    </p>
 <p class="code-block">jdbc:derby://localhost:1527/derbyDB;create=true</p>
-<a name="N1018E"></a><a name="ns_client_noshutdown"></a>
+<a name="N10193"></a><a name="ns_client_noshutdown"></a>
 <h4>Don't shut Derby down</h4>
 <p>
    If you look at the <span class="codefrag">SimpleApp.java</span> code you'll
notice that it
@@ -656,13 +664,13 @@
    other applications might be accessing
    the same database you are; so, don't shut down the databases or Derby.
    </p>
-<a name="N1019F"></a><a name="compile_ns_client"></a>
+<a name="N101A4"></a><a name="compile_ns_client"></a>
 <h3 class="boxed">Compile Sample Application</h3>
 <p>
    Compile the sample application as shown below:
    </p>
 <p class="code-block">javac SimpleApp.java</p>
-<a name="N101AD"></a><a name="run_ns_client"></a>
+<a name="N101B2"></a><a name="run_ns_client"></a>
 <h3 class="boxed">Run Sample Application</h3>
 <p>
    Run the sample application like this:
@@ -688,14 +696,14 @@
    </p>
 <p>
 <em>(Answer: In the default
-   <span class="codefrag">$DERBY_INSTALL/frameworks/NetworkServer/bin</span>
location.)
+   <span class="codefrag">$DERBY_INSTALL/bin</span> location.)
    </em>
    
 </p>
 </div>
 
 
-<a name="N101D1"></a><a name="stop_ns"></a>
+<a name="N101D6"></a><a name="stop_ns"></a>
 <h2 class="boxed">Stop Network Server</h2>
 <div class="section">
 <p>
@@ -704,12 +712,12 @@
 <span class="codefrag">stopNetworkServer.ksh</span> (UNIX) script, as shown below:
 </p>
 <p class="code-block">Windows:
-C:\&gt; cd %DERBY_INSTALL%\frameworks\NetworkServer\bin
-C:\Apache\db-derby-10.1.2.1-bin\frameworks\NetworkServer\bin&gt; setNetworkServerCP.bat
-C:\Apache\db-derby-10.1.2.1-bin\frameworks\NetworkServer\bin&gt; stopNetworkServer.bat
+C:\&gt; cd %DERBY_INSTALL%\bin
+C:\Apache\db-derby-10.4.1.3-bin\bin&gt; setNetworkServerCP.bat
+C:\Apache\db-derby-10.4.1.3-bin\bin&gt; stopNetworkServer.bat
 </p>
 <p class="code-block">UNIX:
-$ cd $DERBY_INSTALL/frameworks/NetworkServer/bin
+$ cd $DERBY_INSTALL/bin
 $ . setNetworkServerCP.ksh
 $ stopNetworkServer.ksh
 </p>
@@ -719,10 +727,10 @@
 </div>
 
 
-<a name="N101EF"></a><a name="ns_next_steps"></a>
+<a name="N101F4"></a><a name="ns_next_steps"></a>
 <h2 class="boxed">Next Steps</h2>
 <div class="section">
-<a name="N101F5"></a><a name="Network+Server+Options"></a>
+<a name="N101FA"></a><a name="Network+Server+Options"></a>
 <h3 class="boxed">Network Server Options</h3>
 <p>
 By default, the Derby Network Server only accepts requests from the
@@ -749,7 +757,7 @@
 <a href="http://db.apache.org/derby/manuals">Derby Server and 
 Administration Guide</a>.
 </p>
-<a name="N1021A"></a><a name="Embedded+Server"></a>
+<a name="N1021F"></a><a name="Embedded+Server"></a>
 <h3 class="boxed">Embedded Server</h3>
 <p>
 Up until this point,

Modified: db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/embedded_intro.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/embedded_intro.xml?rev=652532&r1=652531&r2=652532&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/embedded_intro.xml
(original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/embedded_intro.xml
Thu May  1 07:26:06 2008
@@ -72,7 +72,7 @@
    <p>
    The Derby software includes a sample application called 
    <code>SimpleApp.java</code>.
-   In Derby 10.2 it is located in the
+   In Derby 10.2 and above it is located in the
    <code>DERBY_INSTALL/demo/programs/simple/</code> directory.
    (In Derby 10.1 it is located in the
    <code>DERBY_INSTALL/demo/simple/</code> directory.)
@@ -182,7 +182,7 @@
    </p>
    
    <p class="code-block">javac SimpleApp.java</p>
-
+<p>You can safely ignore any compile warnings that might pop up.</p>
    </section>
 
    <section id="run_sample_app">
@@ -272,7 +272,7 @@
 </p>
 
 <p class="code-block">java org.apache.derby.tools.ij
-ij version 10.1
+ij version 10.4
 ij&gt; connect 'jdbc:derby:derbyDB';
 ij&gt;
 </p>
@@ -284,11 +284,18 @@
 </p>
 
 <p class="code-block">java SimpleApp
-SimpleApp starting in embedded mode.
-Loaded the appropriate driver.
-exception thrown:
-SQL Exception: Failed to start database 'derbyDB', see the next exception for details.
-SQL Exception: Another instance of Derby may have already booted the database /home/jta/databases/sample_app/derbyDB.
+SimpleApp starting in embedded mode
+Loaded the appropriate driver
+
+----- SQLException -----
+  SQL State:  XJ040
+  Error Code: 40000
+  Message:    Failed to start database 'derbyDB', see the next exception for details.
+
+----- SQLException -----
+  SQL State:  XSDB6
+  Error Code: 45000
+  Message:    Another instance of Derby may have already booted the database C:\Apache\db-derby-10.4.1.3-bin\tutorial\derbyDB.
 SimpleApp finished
 </p>
 

Modified: db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/ij_intro.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/ij_intro.xml?rev=652532&r1=652531&r2=652532&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/ij_intro.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/ij_intro.xml Thu May
 1 07:26:06 2008
@@ -32,7 +32,7 @@
 <p>
 This section uses the Derby Embedded JDBC driver to introduce a few 
 <code>ij</code> features.
-The information presented here is minimal, just enough to get started.
+The information presented here is minimal, just enough to get you started.
 For a more complete introduction, see the
 <a href="http://db.apache.org/derby/docs/dev/tools/ctoolsij32837.html">Getting
 started with ij</a> section
@@ -60,7 +60,7 @@
 
 <p>You should see the output shown below:</p>
 
-<p class="code-block">ij version 10.1
+<p class="code-block">ij version 10.4
 ij&gt;
 </p>
 
@@ -96,7 +96,7 @@
 <p class="code-block">ij&gt; connect 'jdbc:derby:MyDbTest;create=true';</p>
 
 <p>
-Now quit out of <code>ij</code>:
+Now exit <code>ij</code>:
 </p>
 
 <p class="code-block">ij&gt; exit; </p>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/index.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/index.xml?rev=652532&r1=652531&r2=652532&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/index.xml Thu May
 1 07:26:06 2008
@@ -154,6 +154,6 @@
 
 </section>
 
-<p><em>Last updated: March 20, 2006</em></p>
+<p><em>Last updated: April 30, 2008</em></p>
 </body>
 </document>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/install_software.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/install_software.xml?rev=652532&r1=652531&r2=652532&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/install_software.xml
(original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/install_software.xml
Thu May  1 07:26:06 2008
@@ -47,8 +47,8 @@
 <section id="jdk">
 <title>Java Development Kit (JDK)</title>
 
-<p>Derby requires Java 2 Standard Edition (J2SE) 1.3 or higher
-(this tutorial was developed using JDK 1.4.2).
+<p>Derby requires Java 2 Standard Edition (J2SE) 1.4.2 or higher
+(this tutorial was developed using JDK 1.5).
 Only the Java Runtime Environment (JRE) is required to run Derby,
 but this tutorial compiles a Java application, so it requires
 the Java Development Kit (JDK).
@@ -66,7 +66,7 @@
 If you have not already installed a JDK,
 download and install it now. 
 No specific vendor implementation is required;
-the only requirement is that it be certified for J2SE 1.3 or higher.
+the only requirement is that it be certified for J2SE 1.4.2 or higher.
 Java's reference implementation is at
 <a href="http://java.sun.com/j2se/">http://java.sun.com/j2se/</a>.
 After installing the JDK of your choice, proceed to the next section.
@@ -80,17 +80,18 @@
 Set the <code>JAVA_HOME</code> environment variable to the root location of
 the JDK installation directory.
 The examples below use
-<code>C:\jdk1.4</code> for Windows and 
-<code>/opt/jdk1.4</code> for UNIX, but be sure to use the actual
-location on your system.
+<code>C:\jdk1.5</code> for Windows and 
+<code>/opt/jdk1.5</code> for UNIX, but be sure to use the actual
+location on your system. (e.g. The default installation location used by the JDK 
+installer might be something like C:\Program Files\Java\jdk1.5.0_06)
 </p>
 
 <p class="code-block">Windows:
-C:\&gt; set JAVA_HOME=C:\jdk1.4
+C:\&gt; set JAVA_HOME=C:\jdk1.5
 </p>
 
 <p class="code-block">UNIX Korn Shell:
-$ export JAVA_HOME=/opt/jdk1.4
+$ export JAVA_HOME=/opt/jdk1.5
 </p>
 
 <p>
@@ -103,7 +104,7 @@
 <p class="code-block">Windows:
 C:\&gt; set PATH=%PATH%;%JAVA_HOME%\bin
 </p>
-
+<p>In Windows, these envoronment variables can also be set from - right click "My Computer"
-> Advanced -> Environment Variables.</p>
 <p class="code-block">UNIX Korn Shell:
 $ export PATH=$JAVA_HOME/bin:$PATH
 </p>
@@ -119,9 +120,9 @@
 </p>
 
 <p class="code-block">java -version
-java version "1.4.2_04"
-Java(TM) 2 Runtime Environment, Standard Edition (build 1.4.2_04-b05)
-Java HotSpot(TM) Client VM (build 1.4.2_04-b05, mixed mode)
+java version "1.5.0_06"
+Java(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_06-b05)
+Java HotSpot(TM) Client VM (build 1.5.0_06-b05, mixed mode, sharing)
 </p>
 
 <p>
@@ -144,20 +145,20 @@
 <p>
 Download the binary Apache Derby distribution from the Derby web site at 
 <a href="http://db.apache.org/derby/derby_downloads.html">http://db.apache.org/derby/derby_downloads.html</a>.
-These tutorial instructions use version 10.1.2.1 and 
+These tutorial instructions use version 10.4.1.3 and 
 assume you downloaded one of the binary distribution files 
 listed in the table below:
 </p>
 
 <table>
      <tr><th>Operating System</th><th>Download File</th></tr>
-     <tr><td>Windows</td><td>db-derby-10.1.2.1-bin.zip</td></tr>
-     <tr><td>UNIX, Linux, and Mac</td><td>db-derby-10.1.2.1-bin.tar.gz</td></tr>
+     <tr><td>Windows</td><td>db-derby-10.4.1.3-bin.zip</td></tr>
+     <tr><td>UNIX, Linux, and Mac</td><td>db-derby-10.4.1.3-bin.tar.gz</td></tr>
 </table>
 
 <p>If a more recent release is available, download that,
    then substitute that version number 
-for <code>10.1.2.1</code> in the following instructions.
+for <code>10.4.1.3</code> in the following instructions.
    </p>
    </section>
 
@@ -173,22 +174,22 @@
     extract it as shown below.
     </p>
 
-<p class="code-block">Windows (use your extraction tool -- these instructions show
mks unzip):
+<p class="code-block">Windows (use your extraction tool e.g. WinZip -- these instructions
use mks unzip):
 mkdir C:\Apache
-copy db-derby-10.1.2.1-bin.zip C:\Apache
+copy db-derby-10.4.1.3-bin.zip C:\Apache
 cd C:\Apache
-unzip db-derby-10.1.2.1-bin.zip
+unzip db-derby-10.4.1.3-bin.zip
 </p>
 
 <p class="code-block">UNIX:
 mkdir /opt/Apache
-cp db-derby-10.1.2.1-bin.tar.gz /opt/Apache
+cp db-derby-10.4.1.3-bin.tar.gz /opt/Apache
 cd /opt/Apache
-tar xzvf db-derby-10.1.2.1-bin.tar.gz
+tar xzvf db-derby-10.4.1.3-bin.tar.gz
 </p>
 
    <p>In both cases, the software will now be extracted into a subdirectory
-    named <code>db-derby-10.1.2.1-bin</code>. 
+    named <code>db-derby-10.4.1.3-bin</code>. 
    </p>
 
 </section>
@@ -203,11 +204,11 @@
 </p>
 
 <p class="code-block">Windows:
-C:\&gt; set DERBY_INSTALL=C:\Apache\db-derby-10.1.2.1-bin
+C:\&gt; set DERBY_INSTALL=C:\Apache\db-derby-10.4.1.3-bin
 </p>
 
 <p class="code-block">UNIX Korn Shell:
-$ export DERBY_INSTALL=/opt/Apache/db-derby-10.1.2.1-bin
+$ export DERBY_INSTALL=/opt/Apache/db-derby-10.4.1.3-bin
 </p>
 
 </section>
@@ -223,7 +224,7 @@
               Derby Embedded JDBC driver</li>
      <li> <code>derbytools.jar</code>:
            optional, provides the <code>ij</code> tool that is used
-          by a couple sections in this tutorial</li>
+          by a couple of sections in this tutorial</li>
 </ul>
 
 <p>
@@ -250,7 +251,7 @@
 </p>
 <p>
    Change directory now into the
-   <code>DERBY_INSTALL/frameworks/embedded/bin</code> directory.
+   <code>DERBY_INSTALL/bin</code> directory.
     The <code>setEmbeddedCP.bat</code> (Windows) 
     and <code>setEmbeddedCP.ksh</code>
      (UNIX) scripts use the <code>DERBY_INSTALL</code> variable to set the 
@@ -265,12 +266,12 @@
    </p>
 
 <p class="code-block">Windows:
-C:\&gt; cd %DERBY_INSTALL%\frameworks\embedded\bin
-C:\Apache\db-derby-10.1.2.1-bin\frameworks\embedded\bin&gt; setEmbeddedCP.bat
+C:\&gt; cd %DERBY_INSTALL%\bin
+C:\Apache\db-derby-10.4.1.3-bin\bin&gt; setEmbeddedCP.bat
 </p>
 
 <p class="code-block">UNIX:
-$ cd $DERBY_INSTALL/frameworks/embedded/bin
+$ cd $DERBY_INSTALL/bin
 $ . setEmbeddedCP.ksh
 </p>
 
@@ -288,30 +289,37 @@
 <p>Successful output will look something like this:</p>
 
 <p class="code-block">------------------ Java Information ------------------
-Java Version:    1.4.2_06
+Java Version:    1.5.0_06
 Java Vendor:     Sun Microsystems Inc.
-Java home:       /opt/jdk1.4
-Java classpath:  /opt/Apache/db-derby-10.1.2.1-bin/lib/derby.jar:/opt/Apache/db-derby-10.1.2.1-bin/lib/derbytools.jar:
-OS name:         Linux
-OS architecture: i386
-OS version:      2.6.10-1.760_FC3
-Java user name:  jta
-Java user home:  /home/jta
-Java user dir:   /opt/Apache/db-derby-10.1.2.1-bin/frameworks/embedded/bin
+Java home:       C:\jdk1.5
+Java classpath:  C:\Apache\DB-DER~1.3-B\lib\derby.jar;C:\Apache\DB-DER~1.3-B\lib\derbytools.jar;
+OS name:         Windows XP
+OS architecture: x86
+OS version:      5.1
+Java user name:  user
+Java user home:  C:\Documents and Settings\user
+Java user dir:   C:\Apache\db-derby-10.4.1.3-bin\bin
 java.specification.name: Java Platform API Specification
-java.specification.version: 1.4
+java.specification.version: 1.5
 --------- Derby Information --------
-JRE - JDBC: J2SE 1.4.2 - JDBC 3.0
-[/opt/Apache/db-derby-10.1.2.1-bin/lib/derby.jar] 10.1.2.1 - (330608)
-[/opt/Apache/db-derby-10.1.2.1-bin/lib/derbytools.jar] 10.1.2.1 - (330608)
+JRE - JDBC: J2SE 5.0 - JDBC 3.0
+[C:\Apache\db-derby-10.4.1.3-bin\lib\derby.jar] 10.4.1.3 - (648739)
+[C:\Apache\db-derby-10.4.1.3-bin\lib\derbytools.jar] 10.4.1.3 - (648739)
 ------------------------------------------------------
 ----------------- Locale Information -----------------
+Current Locale :  [English/United States [en_US]]
+Found support for locale: [cs]
+.
+.
+.
+Found support for locale: [zh_TW]
+         version: 10.4.1.3 - (648739)
 ------------------------------------------------------
 </p>
 
 <p>
 The output on your system will probably be somewhat different 
-than the output shown above, 
+from the output shown above, 
 but it should reflect the correct location 
 of jar files on your machine and there shouldn't be any errors. 
 If you see an error like the one below, 
@@ -330,12 +338,12 @@
 </p>
 <p class="code-block">Windows:
 C:\&gt; echo %CLASSPATH% 
-C:\Apache\DB-DER~1.1-B\lib\derby.jar;C:\Apache\DB-DER~1.1-B\lib\derbytools.jar;
+C:\Apache\DB-DER~1.3-B\lib\derby.jar;C:\Apache\DB-DER~1.3-B\lib\derbytools.jar;
 </p>
 
 <p class="code-block">UNIX:
 $ echo $CLASSPATH
-/opt/Apache/db-derby-10.1.2.1-bin/lib/derby.jar:/opt/Apache/db-derby-10.1.2.1-bin/lib/derbytools.jar:
+/opt/Apache/db-derby-10.4.1.3-bin/lib/derby.jar:/opt/Apache/db-derby-10.4.1.3-bin/lib/derbytools.jar:
 </p>
 
 <p>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/ns_intro.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/ns_intro.xml?rev=652532&r1=652531&r2=652532&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/ns_intro.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/ns_intro.xml Thu May
 1 07:26:06 2008
@@ -80,6 +80,8 @@
      <li> <code>derbynet.jar</code>: contains the code for
    the Derby Network Server
      </li>
+	 <li><code>derbytools.jar</code>: contains Derby tools
+     </li>
 </ul>
 
 <p>
@@ -97,19 +99,19 @@
    You can also use the script that the Derby software distribution provides 
    to set <code>CLASSPATH</code>.
    Change directory to the
-   <code>DERBY_INSTALL/frameworks/NetworkServer/bin</code> directory,
+   <code>DERBY_INSTALL/bin</code> directory,
     then execute
    <code>setNetworkServerCP.bat</code> (Windows) or
      <code>setNetworkServerCP.ksh</code> (UNIX), as shown below:
    </p>
 
 <p class="code-block">Windows:
-C:\&gt; cd %DERBY_INSTALL%\frameworks\NetworkServer\bin
-C:\Apache\db-derby-10.1.2.1-bin\frameworks\NetworkServer\bin&gt; setNetworkServerCP.bat
+C:\&gt; cd %DERBY_INSTALL%\bin
+C:\Apache\db-derby-10.4.1.3-bin\bin&gt; setNetworkServerCP.bat
 </p>
 
 <p class="code-block">UNIX:
-$ cd $DERBY_INSTALL/frameworks/NetworkServer/bin
+$ cd $DERBY_INSTALL/bin
 $ . setNetworkServerCP.ksh
 </p>
 
@@ -126,12 +128,16 @@
 </p>
 
 <p class="code-block">Windows:
-C:\Apache\db-derby-10.1.2.1-bin\frameworks\NetworkServer\bin&gt; startNetworkServer.bat
-Server is ready to accept connections on port 1527.
+C:\Apache\db-derby-10.4.1.3-bin\bin&gt; startNetworkServer.bat
+Security manager installed using the Basic server security policy.
+Apache Derby Network Server - 10.4.1.3 - (648739) started and ready to 
+	accept connections on port 1527 at 2008-04-28 17:13:13.921 GMT
 </p>
 <p class="code-block">UNIX:
 $ startNetworkServer.ksh
-Server is ready to accept connections on port 1527.
+Security manager installed using the Basic server security policy.
+Apache Derby Network Server - 10.4.1.3 - (648739) started and ready to 
+	accept connections on port 1527 at 2008-04-30 09:35:55.871 GMT 
 </p>
 
 <p>
@@ -184,14 +190,14 @@
    You can also use the script that the Derby software distribution provides 
    to set <code>CLASSPATH</code>.
    Change directory to the
-   <code>DERBY_INSTALL/frameworks/NetworkServer/bin</code> directory,
+   <code>DERBY_INSTALL/bin</code> directory,
     then execute
     the <code>setNetworkClientCP.bat</code> (Windows) or
      <code>setNetworkClientCP.ksh</code> (UNIX) script as shown below:
     </p>
 
 <p class="code-block">Windows:
-C:\Apache\db-derby-10.1.2.1-bin\frameworks\NetworkServer\bin&gt; setNetworkClientCP.bat
+C:\Apache\db-derby-10.4.1.3-bin\bin&gt; setNetworkClientCP.bat
 </p>
 
 <p class="code-block">UNIX:
@@ -220,7 +226,7 @@
 ij&gt; connect 'jdbc:derby://localhost:1527/MyDbTest;create=true';</p>
 
    <p>
-   Where is the physical location of the newly created database?
+   What is the physical location of the newly created database?
    </p>
    <p>
    If you use the embedded driver, by default the database is created
@@ -229,7 +235,7 @@
    by default the database is created
    in the directory where the Network Server was started up; 
    in other words, in
-   <code>DERBY_INSTALL/frameworks/NetworkServer/bin</code>.
+   <code>DERBY_INSTALL/bin</code>.
    </p>
 
    <p>
@@ -369,7 +375,7 @@
    </p>
 
    <p><em>(Answer: In the default
-   <code>$DERBY_INSTALL/frameworks/NetworkServer/bin</code> location.)
+   <code>$DERBY_INSTALL/bin</code> location.)
    </em>
    </p>
 
@@ -386,12 +392,12 @@
 </p>
 
 <p class="code-block">Windows:
-C:\&gt; cd %DERBY_INSTALL%\frameworks\NetworkServer\bin
-C:\Apache\db-derby-10.1.2.1-bin\frameworks\NetworkServer\bin&gt; setNetworkServerCP.bat
-C:\Apache\db-derby-10.1.2.1-bin\frameworks\NetworkServer\bin&gt; stopNetworkServer.bat
+C:\&gt; cd %DERBY_INSTALL%\bin
+C:\Apache\db-derby-10.4.1.3-bin\bin&gt; setNetworkServerCP.bat
+C:\Apache\db-derby-10.4.1.3-bin\bin&gt; stopNetworkServer.bat
 </p>
 <p class="code-block">UNIX:
-$ cd $DERBY_INSTALL/frameworks/NetworkServer/bin
+$ cd $DERBY_INSTALL/bin
 $ . setNetworkServerCP.ksh
 $ stopNetworkServer.ksh
 </p>



Mime
View raw message