db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r538199 - in /db/derby/site/trunk: build/site/papers/DerbyTut/ src/documentation/content/xdocs/papers/DerbyTut/
Date Tue, 15 May 2007 15:13:28 GMT
Author: jta
Date: Tue May 15 08:13:27 2007
New Revision: 538199

URL: http://svn.apache.org/viewvc?view=rev&rev=538199
Log:
In the Derby online tutorial (http://db.apache.org/derby/papers/DerbyTut)
note the directory location for the SimpleApp.java application in 10.2 
versus 10.1.  

Thanks to Lars Aurbakken for posting the discrepancy to derby-user.

Modified:
    db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.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/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?view=diff&rev=538199&r1=538198&r2=538199
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.html Tue May 15 08:13:27
2007
@@ -354,15 +354,14 @@
 <a name="N1003F"></a><a name="copy_sample_app"></a>
 <h3 class="boxed">Copy sample application</h3>
 <p>
-   The Derby software includes a sample application. Copy that application
-   into your current directory as shown below:
+   The Derby software includes a sample application called 
+   <span class="codefrag">SimpleApp.java</span>.
+   In Derby 10.2 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.)
+   Copy that application into your current directory.
    </p>
-<p class="code-block">Windows:
-c:\&gt; copy %DERBY_INSTALL%\demo\simple\SimpleApp.java .
-</p>
-<p class="code-block">UNIX:
-cp $DERBY_INSTALL/demo/simple/SimpleApp.java .
-</p>
 <p>
    By default this application runs in embedded mode and does the following:
    </p>
@@ -387,7 +386,7 @@
 <li> Shuts down Derby</li>
    
 </ul>
-<a name="N10072"></a><a name="em_lookat_code"></a>
+<a name="N10073"></a><a name="em_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
@@ -399,7 +398,7 @@
    section shows how the same JDBC calls turn the same code into a 
    client/server application.
    </p>
-<a name="N10082"></a><a name="embedded_driver"></a>
+<a name="N10083"></a><a name="embedded_driver"></a>
 <h4>Load the Embedded JDBC Driver</h4>
 <p>
    The <span class="codefrag">SimpleApp</span> application
@@ -409,7 +408,7 @@
 ...
 Class.forName(driver).newInstance();
 </p>
-<a name="N10093"></a><a name="embedded_url"></a>
+<a name="N10094"></a><a name="embedded_url"></a>
 <h4>Get an Embedded Connection</h4>
 <p>
    The <span class="codefrag">SimpleApp</span> application
@@ -423,7 +422,7 @@
    That embedded connection URL, fully constructed, looks like this:
    </p>
 <p class="code-block">jdbc:derby:derbyDB;create=true</p>
-<a name="N100AE"></a><a name="shutdown"></a>
+<a name="N100AF"></a><a name="shutdown"></a>
 <h4>Shut Derby down</h4>
 <p>A clean shutdown performs a checkpoint and releases resources. 
       If an embedded application doesn't shut down Derby, 
@@ -441,13 +440,13 @@
     A clean shutdown always throws SQL exception <span class="codefrag">XJ015</span>,

     which can be ignored.
    </p>
-<a name="N100D0"></a><a name="compile_sample_app"></a>
+<a name="N100D1"></a><a name="compile_sample_app"></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="N100DE"></a><a name="run_sample_app"></a>
+<a name="N100DF"></a><a name="run_sample_app"></a>
 <h3 class="boxed">Run sample application</h3>
 <p>
    Run the sample application like this:
@@ -499,7 +498,7 @@
 </div>
 
 
-<a name="N10106"></a><a name="just_one_app"></a>
+<a name="N10107"></a><a name="just_one_app"></a>
 <h2 class="boxed">Embedded Derby supports multiple users in one JVM</h2>
 <div class="section">
 <p>

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?view=diff&rev=538199&r1=538198&r2=538199
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyTut/ns_intro.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyTut/ns_intro.html Tue May 15 08:13:27 2007
@@ -549,15 +549,7 @@
 <p>
    This section uses the same sample application that the 
    "<a href="embedded_intro.html">Embedded Derby</a>" section uses.
-   Copy that application
-   into your current directory as shown below:
    </p>
-<p class="code-block">Windows:
-c:\&gt; copy %DERBY_INSTALL%\demo\simple\SimpleApp.java .
-</p>
-<p class="code-block">UNIX:
-cp $DERBY_INSTALL/demo/simple/SimpleApp.java .
-</p>
 <p>
    By default this application runs in embedded mode.
    If you pass it the <span class="codefrag">derbyclient</span> argument at run
time, 
@@ -565,7 +557,7 @@
    create and connect to the database using the Derby Network Client JDBC
    driver instead.
    </p>
-<a name="N10154"></a><a name="ns_lookat_code"></a>
+<a name="N1014C"></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
@@ -576,7 +568,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="N10164"></a><a name="jdbc_ns_client"></a>
+<a name="N1015C"></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,
@@ -587,7 +579,7 @@
 ...
 Class.forName(driver).newInstance();
 </p>
-<a name="N10178"></a><a name="url_ns_client"></a>
+<a name="N10170"></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,
@@ -602,7 +594,7 @@
    That connection URL, fully constructed, looks like this:
    </p>
 <p class="code-block">jdbc:derby://localhost:1527/derbyDB;create=true</p>
-<a name="N10196"></a><a name="ns_client_noshutdown"></a>
+<a name="N1018E"></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
@@ -611,13 +603,13 @@
    other applications might be accessing
    the same database you are; so, don't shut down the databases or Derby.
    </p>
-<a name="N101A7"></a><a name="compile_ns_client"></a>
+<a name="N1019F"></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="N101B5"></a><a name="run_ns_client"></a>
+<a name="N101AD"></a><a name="run_ns_client"></a>
 <h3 class="boxed">Run Sample Application</h3>
 <p>
    Run the sample application like this:
@@ -650,7 +642,7 @@
 </div>
 
 
-<a name="N101D9"></a><a name="stop_ns"></a>
+<a name="N101D1"></a><a name="stop_ns"></a>
 <h2 class="boxed">Stop Network Server</h2>
 <div class="section">
 <p>
@@ -674,10 +666,10 @@
 </div>
 
 
-<a name="N101F7"></a><a name="ns_next_steps"></a>
+<a name="N101EF"></a><a name="ns_next_steps"></a>
 <h2 class="boxed">Next Steps</h2>
 <div class="section">
-<a name="N101FD"></a><a name="Network+Server+Options"></a>
+<a name="N101F5"></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
@@ -704,7 +696,7 @@
 <a href="http://db.apache.org/derby/manuals">Derby Server and 
 Administration Guide</a>.
 </p>
-<a name="N10222"></a><a name="Embedded+Server"></a>
+<a name="N1021A"></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?view=diff&rev=538199&r1=538198&r2=538199
==============================================================================
--- 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
Tue May 15 08:13:27 2007
@@ -70,17 +70,14 @@
    <title>Copy sample application</title>
 
    <p>
-   The Derby software includes a sample application. Copy that application
-   into your current directory as shown below:
+   The Derby software includes a sample application called 
+   <code>SimpleApp.java</code>.
+   In Derby 10.2 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.)
+   Copy that application into your current directory.
    </p>
-
-<p class="code-block">Windows:
-c:\&gt; copy %DERBY_INSTALL%\demo\simple\SimpleApp.java .
-</p>
-
-<p class="code-block">UNIX:
-cp $DERBY_INSTALL/demo/simple/SimpleApp.java .
-</p>
 
    <p>
    By default this application runs in embedded mode and does the following:

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?view=diff&rev=538199&r1=538198&r2=538199
==============================================================================
--- 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 Tue May
15 08:13:27 2007
@@ -258,17 +258,7 @@
    <p>
    This section uses the same sample application that the 
    "<a href="embedded_intro.html">Embedded Derby</a>" section uses.
-   Copy that application
-   into your current directory as shown below:
    </p>
-
-<p class="code-block">Windows:
-c:\&gt; copy %DERBY_INSTALL%\demo\simple\SimpleApp.java .
-</p>
-
-<p class="code-block">UNIX:
-cp $DERBY_INSTALL/demo/simple/SimpleApp.java .
-</p>
 
    <p>
    By default this application runs in embedded mode.



Mime
View raw message