db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scotsmat...@apache.org
Subject svn commit: r546665 [1/3] - in /db/derby/docs/trunk/src: getstart/ tools/
Date Tue, 12 Jun 2007 23:24:39 GMT
Author: scotsmatrix
Date: Tue Jun 12 16:24:36 2007
New Revision: 546665

URL: http://svn.apache.org/viewvc?view=rev&rev=546665
Log:
Derby-2390: Merged the WWD guide into the GS guide. Phase1 comments from Stan and Kim. Patch contributed by me.

Added:
    db/derby/docs/trunk/src/getstart/cgstutorialintro.dita   (with props)
    db/derby/docs/trunk/src/getstart/cgsusingtoolsutils_temp.dita   (with props)
    db/derby/docs/trunk/src/getstart/cwwdactivities.dita   (with props)
    db/derby/docs/trunk/src/getstart/cwwdsummary.dita   (with props)
    db/derby/docs/trunk/src/getstart/rgsderbyrunjarsyntax.dita   (with props)
    db/derby/docs/trunk/src/getstart/rwwdactivity3.dita   (with props)
    db/derby/docs/trunk/src/getstart/tgsrunningdblook.dita   (with props)
    db/derby/docs/trunk/src/getstart/tgsrunningsysinfo.dita   (with props)
    db/derby/docs/trunk/src/getstart/tgsruntoolsutils.dita   (with props)
    db/derby/docs/trunk/src/getstart/tgssetupenvironment.dita   (with props)
    db/derby/docs/trunk/src/getstart/tgssetupverify.dita   (with props)
    db/derby/docs/trunk/src/getstart/twwdactivity1.dita   (with props)
    db/derby/docs/trunk/src/getstart/twwdactivity1_Setup.dita   (with props)
    db/derby/docs/trunk/src/getstart/twwdactivity1_overview.dita   (with props)
    db/derby/docs/trunk/src/getstart/twwdactivity2.dita   (with props)
    db/derby/docs/trunk/src/getstart/twwdactivity3_Setup.dita   (with props)
    db/derby/docs/trunk/src/getstart/twwdactivity4.dita   (with props)
    db/derby/docs/trunk/src/tools/ttoolsijcreatedatabase.dita   (with props)
Removed:
    db/derby/docs/trunk/src/getstart/cgs22227.dita
    db/derby/docs/trunk/src/getstart/cgs28881.dita
    db/derby/docs/trunk/src/getstart/cgsdocs14707.dita
    db/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita
    db/derby/docs/trunk/src/getstart/rgslib56653.dita
Modified:
    db/derby/docs/trunk/src/getstart/cgs80725.dita
    db/derby/docs/trunk/src/getstart/cgschoos.dita
    db/derby/docs/trunk/src/getstart/cgsinsta.dita
    db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
    db/derby/docs/trunk/src/getstart/cgsintdo.dita
    db/derby/docs/trunk/src/getstart/cgsintro.dita
    db/derby/docs/trunk/src/getstart/cgsintsr.dita
    db/derby/docs/trunk/src/getstart/cgslib19524.dita
    db/derby/docs/trunk/src/getstart/cgsnsexample.dita
    db/derby/docs/trunk/src/getstart/cgsquck13780.dita
    db/derby/docs/trunk/src/getstart/cgsquck19524.dita
    db/derby/docs/trunk/src/getstart/cgsquck35643.dita
    db/derby/docs/trunk/src/getstart/cgsquck70629.dita
    db/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita
    db/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita
    db/derby/docs/trunk/src/getstart/getstartderby.ditamap
    db/derby/docs/trunk/src/getstart/gsconrefs.dita
    db/derby/docs/trunk/src/getstart/rgsdocs17307.dita
    db/derby/docs/trunk/src/getstart/rgsdocs18277.dita
    db/derby/docs/trunk/src/getstart/rgsdocs37966.dita
    db/derby/docs/trunk/src/getstart/rgsdocs99397.dita
    db/derby/docs/trunk/src/getstart/rgslib27507.dita
    db/derby/docs/trunk/src/getstart/rgslib46043.dita
    db/derby/docs/trunk/src/getstart/rgsquck30197.dita
    db/derby/docs/trunk/src/getstart/rgsquck35368.dita
    db/derby/docs/trunk/src/getstart/rgstrademderby.dita
    db/derby/docs/trunk/src/getstart/tgs26250.dita
    db/derby/docs/trunk/src/getstart/tgsrunningij.dita
    db/derby/docs/trunk/src/getstart/tgssetupjavaenvir.dita
    db/derby/docs/trunk/src/tools/derbytools.ditamap

Modified: db/derby/docs/trunk/src/getstart/cgs80725.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgs80725.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgs80725.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgs80725.dita Tue Jun 12 16:24:36 2007
@@ -24,8 +24,8 @@
 </metadata></prolog>
 <conbody>
 <p>The simple application illustrates basic tasks such as:   <ul>
-<li>Starting <ph conref="gsconrefs.dita#prod/productshortname"></ph> </li>
-<li>Loading the <ph conref="gsconrefs.dita#prod/productshortname"></ph> JDBC
+<li>Starting <ph conref="../conrefs.dita#prod/productshortname"></ph> </li>
+<li>Loading the <ph conref="../conrefs.dita#prod/productshortname"></ph> JDBC
 driver</li>
 <li>Running in an embedded or a client/server environment (Network Server)</li>
 <li>Establishing a connection</li>
@@ -34,13 +34,13 @@
 <li>Inserting and selecting data</li>
 <li>Dropping a table</li>
 <li>Disconnecting</li>
-<li>Shutting down a <ph conref="gsconrefs.dita#prod/productshortname"></ph> system</li>
+<li>Shutting down a <ph conref="../conrefs.dita#prod/productshortname"></ph> system</li>
 </ul></p>
 <p>You can find the simple application in the example.html file within the
 /demo/programs/simple directory. The example.html file explains how to run
 the simple application. You can run it in both the embedded server and the
 Network Server environments to familiarize yourself with the different configurations
-of <ph conref="gsconrefs.dita#prod/productshortname"></ph>. </p>
+of <ph conref="../conrefs.dita#prod/productshortname"></ph>. </p>
 <p></p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/getstart/cgschoos.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgschoos.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgschoos.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgschoos.dita Tue Jun 12 16:24:36 2007
@@ -21,15 +21,15 @@
 <concept id="cgschoos" xml:lang="en-us">
 <title>Choosing an installer</title>
 <conbody>
-<p>You can choose between three <ph conref="gsconrefs.dita#prod/productshortname"></ph> installation
+<p>You can choose between three <ph conref="../conrefs.dita#prod/productshortname"></ph> installation
 packages. </p>
 <p><b>Windows:</b> The Windows installer provides an IBM JRE for Windows that
-you can use to run <ph conref="gsconrefs.dita#prod/productshortname"></ph>.
+you can use to run <ph conref="../conrefs.dita#prod/productshortname"></ph>.
 This is a quick, native installer for a user that does not have any previous
 knowledge or experience with Java. The Windows installer has a footprint of
 approximately 60M.</p>
 <p><b>Linux:</b> The Linux installer provides an IBM JRE for Linux that you
-can use to run <ph conref="gsconrefs.dita#prod/productshortname"></ph>. This
+can use to run <ph conref="../conrefs.dita#prod/productshortname"></ph>. This
 is a quick, native installer for a user that does not have any previous knowledge
 or experience with Java. The Linux installer has a footprint of approximately
 70M.</p>

Modified: db/derby/docs/trunk/src/getstart/cgsinsta.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsinsta.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsinsta.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsinsta.dita Tue Jun 12 16:24:36 2007
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!--  
@@ -18,10 +19,16 @@
 limitations under the License.
 -->
 <concept id="cgsinsta" xml:lang="en-us">
-<title>Installing and working with Derby</title>
-<shortdesc>If you are new to <ph conref="gsconrefs.dita#prod/productshortname"></ph> and
-JDBC programming, this section will help you begin using the product.</shortdesc>
+<title>Installing and configuring Derby</title>
+<shortdesc>This section will help you install and configure <ph conref="../conrefs.dita#prod/productshortname"></ph>.</shortdesc>
 <conbody>
-<p>If you are an experienced JDBC programmer, see <xref href="cgsquck19524.dita#cgsquck19524"></xref>.</p>
+<p>After you complete the installation: <ul>
+<li>Access the <xref href="cgstutorialintro.dita#cgstutorialintro">Self-study
+tutorial</xref> to get up and running with Derby. This tutorial demonstrates
+how to use <ph conref="../conrefs.dita#prod/productshortname"></ph> in the
+embedded and client/server configurations.</li>
+<li>If you are an experienced JDBC programmer, you should also see the <xref
+href="cgsquck19524.dita#cgsquck19524"></xref>.</li>
+</ul></p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita Tue Jun 12 16:24:36 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
- 
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!--  
@@ -20,10 +20,8 @@
 -->
 <concept id="cgsinstallingderby" xml:lang="en-us">
 <title>Installing Derby</title>
-<shortdesc>To install <ph conref="gsconrefs.dita#prod/productshortname"></ph> you
-must first download the <ph conref="gsconrefs.dita#prod/productshortname"></ph> zip
-or tar archive from the <ph conref="gsconrefs.dita#prod/productshortname"></ph> Web
-site.</shortdesc>
+<shortdesc>To install <ph conref="../conrefs.dita#prod/productshortname"></ph> you
+must download the distribution and extract the package.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Derby<indexterm>installing</indexterm></indexterm><indexterm>install<indexterm>Derby</indexterm></indexterm>
 <indexterm>distributions<indexterm>bin</indexterm></indexterm><indexterm>distributions<indexterm>lib</indexterm></indexterm>
@@ -31,16 +29,9 @@
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>Navigate your Web browser to <xref format="html" href="http://db.apache.org/derby/derby_downloads.html" scope="external"><ph
-conref="gsconrefs.dita#paths/pathdownload"></ph></xref>. This downloads page
-provides links to several distributions of <ph conref="gsconrefs.dita#prod/productshortname"></ph>,
-including binary and source distributions for the latest official release and 
-for previous official releases. This page also contains a link to 
-<xref format="html" href="http://db.apache.org/derby/dev/derby_source.html" scope="external"><ph
-conref="gsconrefs.dita#paths/pathsource"></ph></xref>, where you can find 
-information on how to use the Subversion version control system to access
-the <ph conref="gsconrefs.dita#prod/productshortname"></ph> source code for a
-specific branch or for the development trunk.</p>
+<p>There are several distributions of <ph conref="../conrefs.dita#prod/productshortname"></ph>,
+including binary and source distributions for the latest official release
+and for previous official releases.</p>
 <p>The distributions are: <ul>
 <li>The <i>bin</i> distribution contains scripts, demonstration programs,
 and documentation. The optimized jar files are available in the <i>lib</i> distribution. </li>
@@ -51,7 +42,18 @@
 <li>The <i>src</i> distribution contains the source files that are used to
 create the <i>bin</i>, <i>lib</i>, and <i>lib-debug</i> distributions.</li>
 </ul></p>
-<p>This guide assumes that you have downloaded the <i>bin</i> distribution.</p>
+<note type="important">The remainder of the instructions in this guide assume
+that you have downloaded the <i>bin</i> distribution.</note>
+<p>To install <ph conref="../conrefs.dita#prod/productshortname"></ph>:</p>
+<p>Navigate your Web browser to <xref format="html" href="http://db.apache.org/derby/derby_downloads.html"
+scope="external"><ph conref="../conrefs.dita#paths/pathdownload"></ph></xref>.
+The downloads page provides links to the distributions of <ph conref="../conrefs.dita#prod/productshortname"></ph> This
+page also contains a link to  <xref format="html" href="http://db.apache.org/derby/dev/derby_source.html"
+scope="external"><ph conref="../conrefs.dita#paths/pathsource"></ph></xref>,
+where you can find  information on how to use the Subversion version control
+system to access the <ph conref="../conrefs.dita#prod/productshortname"></ph> source
+code for a specific branch or for the development trunk.</p>
+<p>Download the zip or tar archive for the distribution that you want to use.</p>
 <p>Extract the downloaded package. The extracted installation contains several
 subdirectories:<ul>
 <li>The <filepath>demo</filepath> subdirectory contains the demonstration
@@ -60,11 +62,16 @@
 utilities and setting up the environment.</li>
 <li>The <filepath>javadoc</filepath> subdirectory contains the <codeph>api</codeph> documentation
 that was generated from source code comments.</li>
-<li>The <filepath>docs</filepath> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation.</li>
-<li>The <filepath>lib</filepath> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> jar 
+<li>The <filepath>docs</filepath> subdirectory contains the <ph conref="../conrefs.dita#prod/productshortname"></ph> documentation.</li>
+<li>The <filepath>lib</filepath> subdirectory contains the <ph conref="../conrefs.dita#prod/productshortname"></ph> jar
 files.</li>
-<li>The <filepath>test</filepath> subdirectory contains regression tests for <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</li>
-<li>The <filepath>frameworks</filepath> subdirectory contains older scripts for executing utilities and setting up the environment. These are provided in this release for backward compatibility. These scripts are deprecated in favor of the scripts in the <filepath>bin</filepath> directory, and will be removed in a future release. </li>
+<li>The <filepath>test</filepath> subdirectory contains regression tests for <ph
+conref="../conrefs.dita#prod/productshortname"></ph>.</li>
+<li>The <filepath>frameworks</filepath> subdirectory contains older scripts
+for executing utilities and setting up the environment. These are provided
+in this release for backward compatibility. These scripts are deprecated in
+favor of the scripts in the <filepath>bin</filepath> directory, and will be
+removed in a future release. </li>
 </ul></p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/getstart/cgsintdo.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsintdo.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsintdo.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsintdo.dita Tue Jun 12 16:24:36 2007
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!--  
@@ -19,18 +20,33 @@
 -->
 <concept id="cgsintdo" xml:lang="en-us">
 <title>Deployment options</title>
-<shortdesc>You can deploy <ph conref="gsconrefs.dita#prod/productshortname"></ph> in
-a number of different ways.</shortdesc>
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> software
+distribution provides two basic deployment options (also referred to as <term>frameworks</term>),
+the simple embedded option and the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server option.</shortdesc>
 <conbody>
-<p>Your deployment options include:<ul>
-<li>Embedded in a single-user Java application. <ph conref="gsconrefs.dita#prod/productshortname"></ph> can
-be almost invisible to the end user because it requires no administration
-and runs in the same Java virtual machine (JVM) as the application.</li>
-<li>Embedded in a multiuser application such as a web server, an application
-server, or a shared development environment.</li>
-<li>Embedded in a server framework. You can use the Network Server
-with the network client driver or a server of your own choice.</li>
-</ul></p>
+<dl><dlentry>
+<dt>Embedded</dt>
+<dd>Refers to <ph conref="../conrefs.dita#prod/productshortname"></ph> being
+started by a simple single-user Java application. With this option <ph conref="../conrefs.dita#prod/productshortname"></ph> runs
+in the same Java virtual machine (JVM) as the application.  <ph conref="../conrefs.dita#prod/productshortname"></ph> can
+be almost invisible to the end user because it is started and stopped by the
+application and often requires no administration.<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> documentation
+often refers to this as the <term>embedded configuration</term> or <term>embedded
+mode</term>.</p></dd>
+</dlentry><dlentry>
+<dt>Server (or Server-based)</dt>
+<dd>Refers to <ph conref="../conrefs.dita#prod/productshortname"></ph> being
+started by an application that provides multi-user connectivity to <ph conref="../conrefs.dita#prod/productshortname"></ph> databases
+across a network. With this option <ph conref="../conrefs.dita#prod/productshortname"></ph> runs
+in the Java virtual machine (JVM) that hosts the Server. Applications connect
+to the Server from different JVMs to access the database. The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server is part of the <ph conref="../conrefs.dita#prod/productshortname"></ph> software
+distribution and provides this type of framework for <ph conref="../conrefs.dita#prod/productshortname"></ph>.
+ <ph conref="../conrefs.dita#prod/productshortname"></ph> also works well
+with other, independently developed Server applications. <p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> documentation
+often refers to this as the <term>Network Server configuration</term> or <term>client/server
+configuration</term>.</p></dd>
+</dlentry></dl>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/getstart/cgsintro.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsintro.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsintro.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsintro.dita Tue Jun 12 16:24:36 2007
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
-
 <!--  
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -19,14 +19,23 @@
 limitations under the License.
 -->
 <concept id="cgsintro" xml:lang="en-us">
-<title>Introducing Derby</title>
-<shortdesc>Welcome to <ph conref="gsconrefs.dita#prod/productshortname"></ph>! <ph
-conref="gsconrefs.dita#prod/productshortname"></ph> is a relational database
-management system (RDBMS) that is based on <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> and SQL.</shortdesc>
+<title>Introduction to Derby</title>
+<shortdesc>Welcome to <ph conref="../conrefs.dita#prod/productshortname"></ph>! <ph
+conref="../conrefs.dita#prod/productshortname"></ph> is a full-featured, open
+source relational database management system (RDBMS) that is based on <tm
+tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> and
+SQL.</shortdesc>
 <conbody>
-<p>This section
-describes <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> is written and
+implemented completely in the Java programming language. <ph conref="../conrefs.dita#prod/productshortname"></ph> provides
+users with a small-footprint standards-based database engine that can be tightly
+embedded into any Java based solution. <ph conref="../conrefs.dita#prod/productshortname"></ph> ensures
+data integrity and provides sophisticated transaction support. In the default
+configuration there is no separate database server to be installed or maintained
+by the end user. For more information on <ph conref="../conrefs.dita#prod/productshortname"></ph>,
+visit the <ph conref="../conrefs.dita#prod/productshortname"></ph> Web site
+at <xref format="html" href="http://db.apache.org/derby/" scope="external">http://db.apache.org/derby</xref>.</p>
+<p>Before you install <ph conref="../conrefs.dita#prod/productshortname"></ph>,
+you should understand the deployment options and system requirements.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/getstart/cgsintsr.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsintsr.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsintsr.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsintsr.dita Tue Jun 12 16:24:36 2007
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!--  
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -14,17 +17,15 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
---> 
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
-
+-->
 <concept id="cgsinstr" xml:lang="en-us">
 <title>System requirements</title>
-<shortdesc><ph conref="gsconrefs.dita#prod/productshortname"></ph> is a database engine
-written completely in Java; it will run in any certified Java Virtual Machine
-(JVM).</shortdesc>
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> is a database
+engine written completely in Java. The database will run in any certified
+Java Virtual Machine (JVM).</shortdesc>
 <conbody>
-<p></p>
+<p>You must have a Java Development Kit (JDK) version 1.4 or higher installed
+on your computer. To check that the correct version of Java is installed,
+issue the <codeph>java -version</codeph> command.</p>
 </conbody>
 </concept>
-

Modified: db/derby/docs/trunk/src/getstart/cgslib19524.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgslib19524.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgslib19524.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgslib19524.dita Tue Jun 12 16:24:36 2007
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!--  
@@ -19,7 +20,7 @@
 -->
 <concept id="cgslib19524" xml:lang="en-us">
 <title>Derby libraries and scripts: complete reference </title>
-<shortdesc>This appendix describes <ph conref="gsconrefs.dita#prod/productshortname"></ph> libraries
+<shortdesc>This section describes <ph conref="../conrefs.dita#prod/productshortname"></ph> libraries
 and scripts.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Libraries</indexterm><indexterm>Classpath</indexterm>

Modified: db/derby/docs/trunk/src/getstart/cgsnsexample.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsnsexample.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsnsexample.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsnsexample.dita Tue Jun 12 16:24:36 2007
@@ -20,7 +20,7 @@
 <concept id="cgsnsexample" xml:lang="en-us">
 <title>Derby Network Server examples</title>
 <conbody>
-<p>The <ph conref="gsconrefs.dita#prod/productshortname"></ph> Network Server
+<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server
 examples are located in the /demo/programs/nserverdemo/ directory. The following
 programs demonstrate how to use the Network Server to set up an embedded connection
 and client connections to connect to the same database: <ul>
@@ -28,7 +28,7 @@
 how a client program that starts up in its own JVM can connect to the Network
 Server that a server program has started. The client program (SimpleNetworkClientSample)
 and the server program (SimpleNetworkServerSample) each run in their own,
-separate JVMs. This example shows the <ph conref="gsconrefs.dita#prod/productshortname"></ph> jar
+separate JVMs. This example shows the <ph conref="../conrefs.dita#prod/productshortname"></ph> jar
 files that the client and the server need in order to use the Network Server.
 The SimpleNetworkClientSample program also shows you how to use either the
 DriverManager class or the DataSource class to establish client connections.</p></li>

Modified: db/derby/docs/trunk/src/getstart/cgsquck13780.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsquck13780.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsquck13780.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsquck13780.dita Tue Jun 12 16:24:36 2007
@@ -20,22 +20,22 @@
 <concept id="cgsquck13780" xml:lang="en-us">
 <title>Client/server environment</title>
 <shortdesc>A client/server environment is an environment in which multiple
-applications connect to <ph conref="gsconrefs.dita#prod/productshortname"></ph> over
+applications connect to <ph conref="../conrefs.dita#prod/productshortname"></ph> over
 the network.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>client/server environment</indexterm><indexterm>environment<indexterm>client/server</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p><ph conref="gsconrefs.dita#prod/productshortname"></ph> runs embedded in
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> runs embedded in
 a server framework that allows multiple network connections. (The framework
-itself starts an instance of <ph conref="gsconrefs.dita#prod/productshortname"></ph> and
+itself starts an instance of <ph conref="../conrefs.dita#prod/productshortname"></ph> and
 runs in an embedded environment. However, the client applications do not run
 in the embedded environment.)</p>
-<p>You can also embed <ph conref="gsconrefs.dita#prod/productshortname"></ph> in
+<p>You can also embed <ph conref="../conrefs.dita#prod/productshortname"></ph> in
 any Java server framework. </p>
-<p>See the <cite><ph conref="gsconrefs.dita#pub/citadmin"></ph></cite> for
-more information on how to run <ph conref="gsconrefs.dita#prod/productshortname"></ph> on
+<p>See the <cite><ph conref="../conrefs.dita#pub/citadmin"></ph></cite> for
+more information on how to run <ph conref="../conrefs.dita#prod/productshortname"></ph> on
 a server.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/getstart/cgsquck19524.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsquck19524.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsquck19524.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsquck19524.dita Tue Jun 12 16:24:36 2007
@@ -24,7 +24,7 @@
 driver.</shortdesc>
 <conbody>
 <p>For more detailed information on the topics covered in this section, see
-the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite> and the <cite><ph
-conref="gsconrefs.dita#pub/citutilities"></ph></cite>.</p>
+the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite> and the <cite><ph
+conref="../conrefs.dita#pub/citutilities"></ph></cite>.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/getstart/cgsquck35643.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsquck35643.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsquck35643.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsquck35643.dita Tue Jun 12 16:24:36 2007
@@ -26,8 +26,8 @@
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>When an application starts an instance of <ph conref="gsconrefs.dita#prod/productshortname"></ph> within
+<p>When an application starts an instance of <ph conref="../conrefs.dita#prod/productshortname"></ph> within
 its JVM, the application runs in an embedded environment. Loading the embedded
-driver starts <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</p>
+driver starts <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/getstart/cgsquck70629.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsquck70629.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsquck70629.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsquck70629.dita Tue Jun 12 16:24:36 2007
@@ -19,12 +19,12 @@
 -->
 <concept id="cgsquck70629" xml:lang="en-us">
 <title>Environments in which Derby can run</title>
-<shortdesc>Before you configure your system to run <ph conref="gsconrefs.dita#prod/productshortname"></ph>,
+<shortdesc>Before you configure your system to run <ph conref="../conrefs.dita#prod/productshortname"></ph>,
 it is useful to understand something about the different environments in which <ph
-conref="gsconrefs.dita#prod/productshortname"></ph> can run, because these
+conref="../conrefs.dita#prod/productshortname"></ph> can run, because these
 environments affect the classpath, driver name, and database connection URL.</shortdesc>
 <conbody>
-<p>See the <cite><ph conref="gsconrefs.dita#pub/citdevelop"></ph></cite> for
-more information on <ph conref="gsconrefs.dita#prod/productshortname"></ph> environments.</p>
+<p>See the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite> for
+more information on <ph conref="../conrefs.dita#prod/productshortname"></ph> environments.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita Tue Jun 12 16:24:36 2007
@@ -20,12 +20,12 @@
 <concept id="cgsstartprogrammingwiththeexamples" xml:lang="en-us">
 <title>Start programming with examples</title>
 <conbody>
-<p><ph conref="gsconrefs.dita#prod/productshortname"></ph> provides two examples
-that you can use to begin programming and become familiar with <ph conref="gsconrefs.dita#prod/productshortname"></ph>'s
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides two examples
+that you can use to begin programming and become familiar with <ph conref="../conrefs.dita#prod/productshortname"></ph>'s
 features. These two examples are:</p>
 <ol>
 <li>Simple example</li>
-<li><ph conref="gsconrefs.dita#prod/productshortname"></ph> Network Server
+<li><ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server
 examples</li>
 </ol>
 </conbody>

Added: db/derby/docs/trunk/src/getstart/cgstutorialintro.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgstutorialintro.dita?view=auto&rev=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgstutorialintro.dita (added)
+++ db/derby/docs/trunk/src/getstart/cgstutorialintro.dita Tue Jun 12 16:24:36 2007
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
+<!-- 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at      
+
+http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<!--##### DO NOT CHANGE ANYTHING ABOVE THIS LINE #####-->
+<concept id="cgstutorialintro" xml:lang="en-us">
+<title>Self-study tutorial for users new to <ph conref="../conrefs.dita#prod/productshortname"></ph></title>
+<shortdesc>To help you get up and running with <ph conref="../conrefs.dita#prod/productshortname"></ph> as
+quickly as possible, this self-study guide highlights some of the more important
+features of  <ph conref="../conrefs.dita#prod/productshortname"></ph>. </shortdesc>
+<prolog><metadata>
+<keywords><indexterm>Java Development Kit version<indexterm>verifying</indexterm></indexterm>
+<indexterm>JDK version<indexterm>verifying</indexterm></indexterm><indexterm>Working
+with Derby activities<indexterm>prerequisites</indexterm></indexterm><indexterm>prerequisites<indexterm>Working
+with Derby activities</indexterm></indexterm><indexterm>environment variables<indexterm>verifying</indexterm></indexterm>
+<indexterm>JAVA_HOME environment variable<indexterm>verifying</indexterm></indexterm>
+<indexterm>DERBY_HOME environment variable<indexterm>verifying</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<conbody>
+<section><p> This tutorial uses a series of activities designed to demonstrate
+the use of  <ph conref="../conrefs.dita#prod/productshortname"></ph> in the
+embedded and client/server configurations. After performing these activities,
+you will find <ph conref="../conrefs.dita#prod/productshortname"></ph> to
+be an easy-to-use and fully functional relational database management system
+(RDBMS). </p><title>Tutorial skills and software requirements</title><p>To
+perform the tutorial activities, you do not need to have any prior knowledge
+of Java software, the Java Database Connectivity (JDBC) API, or SQL. Each
+activity provides the complete command syntax that you need to use for each
+operation. Instructions include the syntax for both a UNIX Korn shell and
+a Windows command prompt.  </p><p>This tutorial demonstrates, but does not
+teach, the Java, JDBC and SQL code that is presented. If you want a deeper
+understanding of these topics, you will need to consult additional reference
+materials.</p><p>To perform the tutorial activities, you must have: <ul>
+<li>A Java Development Kit (JDK) version 1.4 or higher installed on your computer</li>
+<li>The binary (<codeph>bin</codeph>) installation of <ph conref="../conrefs.dita#prod/productlongname"></ph> version <ph
+conref="../conrefs.dita#vers/shortversionnumber"></ph> installed on your computer</li>
+<li>A basic knowledge of the computer command line interface:<ul>
+<li>How to start a command shell or window</li>
+<li>How to navigate the file system hierarchy</li>
+</ul></li>
+</ul></p> </section>
+<section><title>System configuration</title><p>You should <xref href="tgssetupverify.dita#tgssetupverify">verify
+the system configuration</xref> before you perform the tutorial activities.</p></section>
+<section><title>Problems and feedback on the tutorial activities</title><p>If
+you experience problems with any aspect of the tutorial activities, send an
+e-mail message to <codeph>derby-user@db.apache.org</codeph>.  Someone from
+the <ph conref="../conrefs.dita#prod/productshortname"></ph> community will
+respond to your message. </p><p>The questions and feedback received will be
+used to make this tutorial more useful.</p></section>
+</conbody>
+</concept>

Propchange: db/derby/docs/trunk/src/getstart/cgstutorialintro.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita Tue Jun 12 16:24:36 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
- 
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!--  
@@ -19,121 +19,48 @@
 limitations under the License.
 -->
 <concept id="cgsusingtoolsutils" xml:lang="en-us">
-<title>Using the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools
+<title>Using the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
 and startup utilities</title>
 <shortdesc>There are several tools and utilities that you might want to use
-as you begin to work with <ph conref="gsconrefs.dita#prod/productshortname"></ph>. </shortdesc>
+as you begin to work with <ph conref="../conrefs.dita#prod/productshortname"></ph>. </shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Derby<indexterm>scripts, using</indexterm></indexterm>
 <indexterm>Derby<indexterm>tools, using</indexterm></indexterm><indexterm>tools<indexterm>in
 Derby</indexterm></indexterm><indexterm>scripts<indexterm>in Derby</indexterm></indexterm>
-</keywords>
+<indexterm>Derby<indexterm>system procedures</indexterm></indexterm><indexterm>system
+procedures<indexterm>in Derby</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>The tools that are included with <ph conref="gsconrefs.dita#prod/productshortname"></ph> are <cmdname>dblook</cmdname>, <cmdname>ij</cmdname>,
-and <cmdname>sysinfo</cmdname>. You can use the <ph conref="gsconrefs.dita#prod/productshortname"></ph> scripts
-located in the <ph conref="gsconrefs.dita#prod/productinstallpath"></ph><filepath>/bin</filepath> directory
-to start the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools.
-These scripts also help you set up your classpath.</p>
-<p>The scripts
-are set up to run in embedded mode. To run these tools with the Network
-Server, use the following commands: <ul>
-<li>For the <cmdname>dblook</cmdname> tool, call the script and specify the
-<codeph>-d</codeph> option and the full URL to the Network Server database. For 
-example: <codeblock>dblook -d 'jdbc:derby://localhost/myDB;user=usr'</codeblock> </li>
-<li>For the <cmdname>ij</cmdname> tool, issue the command 
-<codeblock>set DERBY_OPTS=-Dij.protocol=jdbc:derby://localhost/</codeblock>
-and then start <cmdname>ij</cmdname> by issuing the command <codeph>ij</codeph>.</li>
-<li>For the <cmdname>sysinfo</cmdname> tool, issue the command 
-<codeblock>NetworkServerControl sysinfo</codeblock></li>
-</ul></p>
-<p>To show how to use the <ph conref="gsconrefs.dita#prod/productshortname"></ph> scripts
-to launch the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools,
-the examples in <cite><ph conref="gsconrefs.dita#pub/citgetstart"></ph></cite> assume
-that you are using the embedded mode of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> database
-engine.</p>
-<p>In addition, there are Derby utilities that are system procedures that you can call
-by using the <cmdname>ij</cmdname> tool. For example, there are system procedures
-that you can use to import and export external files. Instructions on how
-to use these system procedures are included in the <cite><ph conref="gsconrefs.dita#pub/citutilities"></ph></cite> and
-the <cite><ph conref="gsconrefs.dita#pub/citref"></ph></cite>.</p>
-<section>
-<title>Ways to run the tools</title>
-<p>There are several ways to run the tools:</p>
+<p>The tools that are included with <ph conref="../conrefs.dita#prod/productshortname"></ph> are <codeph>dblook</codeph>, <codeph>ij</codeph>,
+and <codeph>sysinfo</codeph>. To run these tools see:</p>
 <ul>
-<li>Follow the instructions in 
-<xref href="tgssetupjavaenvir.dita#tgssetupjavaenvir"></xref>, then 
-run the tools as standalone commands, as described in this section. You may 
-prefer this method if you will run the tools often, because it saves typing.</li>
-<li>Do not set your path, but run the tools using the jar file where the
-tools reside. For example:
-<simpletable relcolwidth="1* 3*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry>Windows</stentry>
-<stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar ij</userinput></b>
-</codeblock></stentry>
-</strow>
-<strow>
-<stentry>UNIX (Korn Shell)</stentry>
-<stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar ij</userinput></b>
-</codeblock></stentry>
-</strow>
-</simpletable>
-<p>You may prefer this method if you you already have a Java executable in your 
-path and you do not want to change your path in order to run the tools. This 
-may be the case if you do not run the tools often or if you want to start 
-running the tools as quickly as possible. </p>
-<p>The syntax for using <codeph>derbyrun.jar</codeph> for each of the tools is 
-as follows. To see this syntax reminder, run the command 
-<codeph>java -jar derbyrun.jar</codeph> with no arguments.</p>
-<simpletable relcolwidth="1* 3*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry>Windows</stentry>
-<stentry><codeblock>
-java -jar %DERBY_HOME%\lib\derbyrun.jar ij [-p <i>propertiesfile</i>] [<i>sql_script</i>]
-java -jar %DERBY_HOME%\lib\derbyrun.jar sysinfo [-cp ...] [-cp help]
-java -jar %DERBY_HOME%\lib\derbyrun.jar dblook [<i>arg</i>]* (or no arguments for usage)
-java -jar %DERBY_HOME%\lib\derbyrun.jar server [<i>arg</i>]* (or no arguments for usage)
-</codeblock></stentry>
-</strow>
-<strow>
-<stentry>UNIX (Korn Shell)</stentry>
-<stentry><codeblock>
-java -jar $DERBY_HOME/lib/derbyrun.jar ij [-p <i>propertiesfile</i>] [<i>sql_script</i>]
-java -jar $DERBY_HOME/lib/derbyrun.jar sysinfo [-cp ...] [-cp help]
-java -jar $DERBY_HOME/lib/derbyrun.jar dblook [<i>arg</i>]* (or no arguments for usage)
-java -jar $DERBY_HOME/lib/derbyrun.jar server [<i>arg</i>]* (or no arguments for usage)
-</codeblock></stentry>
-</strow>
-</simpletable>
-<p>The <codeph>server</codeph> argument is a shortcut for running the 
-<codeph>NetworkServerControl</codeph> tool. For details on using this tool, see
-the <cite><ph conref="gsconrefs.dita#pub/citadmin"></ph></cite>.
-</p>
-<p>For more information on using <codeph>derbyrun.jar</codeph> to run the 
-<codeph>ij</codeph>, <codeph>sysinfo</codeph>, and <codeph>dblook</codeph> 
-tools, see the <cite><ph conref="gsconrefs.dita#pub/citutilities"></ph></cite>.</p>
-</li>
-<li>Set your classpath to include the 
-<codeph>$DERBY_HOME/lib/derbyrun.jar</codeph> file and then use the 
-<codeph>java</codeph> command to run the tools, specifying the class name. 
-For example:
-<codeblock><b><userinput>java org.apache.derby.tools.ij</userinput></b>
-</codeblock>
-<p>You may prefer this method if you need to run the tools on a number of 
-different systems and if you use scripts to set your environment for 
-each one. For details on setting the classpath, see 
-<xref href="tgs26250.dita#tgs26250"></xref>.</p>
-</li>
+<li><xref href="tgsrunningsysinfo.dita#tgsrunningsysinfo"></xref></li>
+<li><xref href="tgsrunningij.dita#tgsrunningij"></xref></li>
+<li><xref href="tgsrunningdblook.dita#tgsrunningdblook"></xref></li>
 </ul>
-</section>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> includes a set
+of scripts that you can use to start the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools.
+The scripts are located in the <ph conref="../conrefs.dita#prod/productinstallpath"></ph><filepath>/bin</filepath> directory.
+When you run these scripts, your CLASSPATH environment variable is set if
+you have not already set it, and remains set as long as you are running the
+tool.</p>
+<p>Most of the examples in this guide that show how to use the <ph conref="../conrefs.dita#prod/productshortname"></ph> scripts
+to launch the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
+assume that you are using the embedded mode of the <ph conref="../conrefs.dita#prod/productshortname"></ph> database
+engine. Use the instructions below to run the scripts with the Network Server.</p>
+<section><title>Running the scripts with the Network Server</title><p>To run
+the scripts with the Network Server, use the following commands: <ul>
+<li>For the <codeph>dblook</codeph> tool, call the script and specify the <codeph>-d</codeph> option
+and the full URL to the Network Server database. For  example: <codeblock>dblook -d 'jdbc:derby://localhost/myDB;user=usr'</codeblock> </li>
+<li>For the <codeph>ij</codeph> tool, issue the command  <codeblock>set DERBY_OPTS=-Dij.protocol=jdbc:derby://localhost/</codeblock> and
+then start <codeph>ij</codeph> by issuing the command <codeph>ij</codeph>.</li>
+<li>For the <codeph>sysinfo</codeph> tool, issue the command  <codeblock>NetworkServerControl sysinfo</codeblock></li>
+</ul></p></section>
+<section><title>Additional <ph conref="../conrefs.dita#prod/productshortname"></ph> utilities</title><p>In
+addition, there are Derby utilities that are system procedures that you can
+call by using the <codeph>ij</codeph> tool. For example, there are system
+procedures that you can use to import and export external files. Instructions
+on how to use these system procedures are included in the <cite><ph conref="../conrefs.dita#pub/citutilities"></ph></cite> and
+the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>.</p></section>
 </conbody>
 </concept>

Added: db/derby/docs/trunk/src/getstart/cgsusingtoolsutils_temp.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsusingtoolsutils_temp.dita?view=auto&rev=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsusingtoolsutils_temp.dita (added)
+++ db/derby/docs/trunk/src/getstart/cgsusingtoolsutils_temp.dita Tue Jun 12 16:24:36 2007
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
+<!--  
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<concept id="cgsusingtoolsutils" xml:lang="en-us">
+<title>The <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
+and startup utilities</title>
+<shortdesc>There are several tools and utilities that you might want to use
+as you begin to work with <ph conref="../conrefs.dita#prod/productshortname"></ph>. </shortdesc>
+<prolog><metadata>
+<keywords><indexterm>Derby<indexterm>scripts, using</indexterm></indexterm>
+<indexterm>Derby<indexterm>tools, using</indexterm></indexterm><indexterm>tools<indexterm>in
+Derby</indexterm></indexterm><indexterm>scripts<indexterm>in Derby</indexterm></indexterm>
+<indexterm>Derby<indexterm>system procedures</indexterm></indexterm><indexterm>system
+procedures<indexterm>in Derby</indexterm></indexterm></keywords>
+</metadata></prolog>
+<conbody>
+<p>The tools that are included with <ph conref="../conrefs.dita#prod/productshortname"></ph> are <codeph>dblook</codeph>, <codeph>ij</codeph>,
+and <codeph>sysinfo</codeph>. <ph conref="../conrefs.dita#prod/productshortname"></ph> includes
+a set of scripts that you can use to start the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools.
+The scripts are located in the <ph conref="../conrefs.dita#prod/productinstallpath"></ph><filepath>/bin</filepath> directory.
+These scripts also help you set up your classpath.</p>
+<p>See <xref href="tgsruntoolsutils.dita#tgsruntoolsutils"></xref></p>
+<p>To show how to use the <ph conref="../conrefs.dita#prod/productshortname"></ph> scripts
+to launch the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools,
+most of the examples in this guide assume that you are using the embedded
+mode of the <ph conref="../conrefs.dita#prod/productshortname"></ph> database
+engine.</p>
+<section><title>Running the scripts with the Network Server</title><p>The
+scripts are designed to run in embedded mode. To run these tools with the
+Network Server, use the following commands: <ul>
+<li>For the <codeph>dblook</codeph> tool, call the script and specify the <codeph>-d</codeph> option
+and the full URL to the Network Server database. For  example: <codeblock>dblook -d 'jdbc:derby://localhost/myDB;user=usr'</codeblock> </li>
+<li>For the <codeph>ij</codeph> tool, issue the command  <codeblock>set DERBY_OPTS=-Dij.protocol=jdbc:derby://localhost/</codeblock> and
+then start <codeph>ij</codeph> by issuing the command <codeph>ij</codeph>.</li>
+<li>For the <codeph>sysinfo</codeph> tool, issue the command  <codeblock>NetworkServerControl sysinfo</codeblock></li>
+</ul></p></section>
+<section><title>Additional <ph conref="../conrefs.dita#prod/productshortname"></ph> utilities</title><p>In
+addition, there are <ph conref="../conrefs.dita#prod/productshortname"></ph> utilities
+that are system procedures that you can call by using the <cmdname>ij</cmdname> tool.
+For example, there are system procedures that you can use to import and export
+external files. Instructions on how to use these system procedures are included
+in the <cite><ph conref="../conrefs.dita#pub/citutilities"></ph></cite> and
+the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>.</p></section>
+</conbody>
+</concept>

Propchange: db/derby/docs/trunk/src/getstart/cgsusingtoolsutils_temp.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/docs/trunk/src/getstart/cwwdactivities.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cwwdactivities.dita?view=auto&rev=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cwwdactivities.dita (added)
+++ db/derby/docs/trunk/src/getstart/cwwdactivities.dita Tue Jun 12 16:24:36 2007
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
+<!-- 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at      
+
+http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<concept id="cgsactivities" xml:lang="en-us">
+<title>Tutorial overview</title>
+<shortdesc>Each activity in this self-study tutorial highlights an important
+feature of  <ph conref="../conrefs.dita#prod/productshortname"></ph>. </shortdesc>
+<prolog><metadata>
+<keywords><indexterm>self-study tutorial<indexterm>overview</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<conbody>
+<p>Here is what you can expect to learn in each activity:</p>
+<dl><dlentry>
+<dt>Activity 1:</dt>
+<dd>Use the  <ph conref="../conrefs.dita#prod/productshortname"></ph>&nbsp;<codeph>ij</codeph> tool
+to load the <ph conref="../conrefs.dita#prod/productshortname"></ph> embedded
+driver and start the  <ph conref="../conrefs.dita#prod/productshortname"></ph> database
+engine.  Create the database <codeph>firstdb</codeph> and the table <codeph>FIRSTTABLE</codeph>.
+Use a few basic SQL statements to insert and select data. The <ph conref="../conrefs.dita#prod/productshortname"></ph> message
+log <codeph>derby.log</codeph> and the database directories and files are
+introduced.</dd>
+</dlentry><dlentry>
+<dt>Activity 2:</dt>
+<dd>Use <ph conref="../conrefs.dita#prod/productshortname"></ph> within a client/server
+configuration. Start the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+Server, which will embed the <ph conref="../conrefs.dita#prod/productshortname"></ph> engine.
+ In a separate process, use the <ph conref="../conrefs.dita#prod/productshortname"></ph>&nbsp;<codeph>ij</codeph> 
+tool to load the <ph conref="../conrefs.dita#prod/productshortname"></ph> client
+driver and connect to the Network Server. Create a database called  <codeph>seconddb</codeph> and
+the table <codeph>SECONDTABLE</codeph>. Use a few  basic SQL statements to
+insert and select data.</dd>
+</dlentry><dlentry>
+<dt>Activity 3:</dt>
+<dd>Load the <ph conref="../conrefs.dita#prod/productshortname"></ph> database
+engine from a simple Java JDBC program. Use the embedded driver to create
+the database <codeph>jdbcDemoDB</codeph> and the <codeph>WISH_LIST</codeph> table.
+ Populate the table with text entered from the keyboard, then view a list
+of the records in the table. Walk through the code to understand the basic
+structure  of a JDBC program that accesses a <ph conref="../conrefs.dita#prod/productshortname"></ph> database.
+The <codeph>CLASSPATH</codeph> variable and connection URL attribute <codeph>;shutdown=true</codeph> are
+introduced.</dd>
+</dlentry><dlentry>
+<dt>Activity 4:</dt>
+<dd>Modify the Java JDBC program to load the client driver and connect to
+the <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server.
+ Compile the altered program and test that the program operates as it did
+in the previous activity.</dd>
+</dlentry></dl>
+</conbody>
+</concept>

Propchange: db/derby/docs/trunk/src/getstart/cwwdactivities.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/docs/trunk/src/getstart/cwwdsummary.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cwwdsummary.dita?view=auto&rev=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/cwwdsummary.dita (added)
+++ db/derby/docs/trunk/src/getstart/cwwdsummary.dita Tue Jun 12 16:24:36 2007
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
+<!-- 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at      
+
+http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<concept id="cgssummary" xml:lang="en-us">
+<title>What next with <ph conref="../conrefs.dita#prod/productshortname"></ph>?</title>
+<shortdesc>Congratulations on completing the activities in this tutorial.
+You now have experience with using  <ph conref="../conrefs.dita#prod/productshortname"></ph> in
+both the embedded and client/server architectures.</shortdesc>
+<conbody>
+<p>With this basic knowledge, you are ready to begin using  <ph conref="../conrefs.dita#prod/productshortname"></ph> to
+address your own  specific needs. As your next step in learning about this
+lightweight and powerful tool, visit the <ph conref="../conrefs.dita#prod/productlongname"></ph> Web
+site.</p>
+<lines importance="high">  <b>Use this link:</b>       <xref format="html"
+href="http://wiki.apache.org/db-derby/WorkingWithDerby" importance="high"
+scope="external"><b>WorkingWithDerby Resources page</b></xref>
+  <b>Browser URL</b>:       <codeph><b>http://wiki.apache.org/db-derby/WorkingWithDerby</b></codeph></lines>
+<section><title>Activities summary</title><p>We hope these activities have
+helped you understand the steps needed to create and access <ph conref="../conrefs.dita#prod/productshortname"></ph> databases.
+Although <ph conref="../conrefs.dita#prod/productshortname"></ph> is easy
+to set up and use, you will find that it has the features and reliability
+of much larger database systems. The examples presented here do not begin
+to scratch the surface of what can be done.</p><p>Please take a few moments
+to become familiar with the many online resources available to <ph conref="../conrefs.dita#prod/productshortname"></ph> users
+and developers by browsing the  <xref format="html" href="http://db.apache.org/derby/index.html"
+scope="external"><ph conref="../conrefs.dita#prod/productshortname"></ph> Web
+site</xref> at Apache.  Whether you are performing a general evaluation of
+ <ph conref="../conrefs.dita#prod/productshortname"></ph> or have a specific
+need to address, the link to the  WorkingWith<ph conref="../conrefs.dita#prod/productshortname"></ph> resources
+page is a good stepping stone to finding additional information of interest:</p><ul>
+<li>The <xref format="html" href="http://db.apache.org/derby/quick_start.html"
+scope="external"><ph conref="../conrefs.dita#prod/productshortname"></ph> Quick
+Start page</xref> is a good reference page organized by area of interest.</li>
+<li>You will find that many content-rich areas, such as the  <ph conref="../conrefs.dita#prod/productshortname"></ph> Wiki
+and the  <ph conref="../conrefs.dita#prod/productshortname"></ph> Users mailing
+list, are available to you.</li>
+<li>If you are interested in how others are using <ph conref="../conrefs.dita#prod/productshortname"></ph>,
+see the Uses of  <ph conref="../conrefs.dita#prod/productshortname"></ph> page
+on the Wiki. This page contains informational links to development projects
+and products that use <ph conref="../conrefs.dita#prod/productshortname"></ph>.
+When you implement a system using <ph conref="../conrefs.dita#prod/productshortname"></ph>,
+please add it to this list.</li>
+</ul></section>
+</conbody>
+</concept>

Propchange: db/derby/docs/trunk/src/getstart/cwwdsummary.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/docs/trunk/src/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/getstartderby.ditamap?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/getstartderby.ditamap (original)
+++ db/derby/docs/trunk/src/getstart/getstartderby.ditamap Tue Jun 12 16:24:36 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
- 
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
  "../dtd/map.dtd">
 <!--  
@@ -31,45 +31,74 @@
 </topicmeta>
 <reltable>
 <relrow>
+<relcell></relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="cgsintro.dita" navtitle="Introduction to Derby"></topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
 <relcell>
 <topicref href="cgsintdo.dita" navtitle="Deployment options"></topicref>
 </relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
 <relcell>
 <topicref href="cgsintsr.dita" navtitle="System requirements"></topicref>
-<topicref href="cgsinsta.dita" navtitle="Installing and working with Derby">
-</topicref>
 </relcell>
+<relcell></relcell>
 </relrow>
 <relrow>
 <relcell>
-<topicref href="cgsinsta.dita" linking="targetonly" navtitle="Installing and working with Derby">
+<topicref href="rgsdocs17307.dita" navtitle="Product documentation for Derby">
 </topicref>
 </relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
 <relcell>
-<topicref href="cgsquck19524.dita" navtitle="Quick start guide for experienced JDBC users">
+<topicref href="cgsinsta.dita" navtitle="Installing and configuring Derby">
 </topicref>
 </relcell>
+<relcell></relcell>
 </relrow>
 <relrow>
 <relcell>
 <topicref href="cgsinstallingderby.dita" navtitle="Installing Derby"></topicref>
 </relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
 <relcell>
-<topicref href="tgssetupjavaenvir.dita" navtitle=" Setting up your Java environment">
+<topicref href="tgssetupenvironment.dita" navtitle="Setting up your environment">
 </topicref>
 </relcell>
+<relcell></relcell>
 </relrow>
 <relrow>
 <relcell>
-<topicref href="tgssetupjavaenvir.dita" navtitle=" Setting up your Java environment">
+<topicref href="tgsruntoolsutils.dita" navtitle="Choosing a method to run the  Derby tools and startup utilities">
 </topicref>
 </relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
 <relcell>
-<topicref href="cgsusingtoolsutils.dita" navtitle="Using the Derby tools and startup utilities">
+<topicref href="tgssetupjavaenvir.dita" navtitle="Setting the environment variables">
 </topicref>
-<topicref href="tgs26250.dita" navtitle="Manually setting the classpath">
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rgsderbyrunjarsyntax.dita" navtitle="Syntax for the derbyrun.jar file">
 </topicref>
 </relcell>
+<relcell></relcell>
 </relrow>
 <relrow>
 <relcell>
@@ -80,40 +109,182 @@
 </relrow>
 <relrow>
 <relcell>
-<topicref href="cgsusingsysinfo.dita" navtitle="Using the sysinfo tool"></topicref>
+<topicref href="tgsrunningsysinfo.dita" navtitle="Running sysinfo"></topicref>
 </relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
 <relcell>
 <topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
-<topicref href="tgs26250.dita" navtitle="Setting the classpath"></topicref>
 </relcell>
+<relcell></relcell>
 </relrow>
 <relrow>
 <relcell>
-<topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
+<topicref href="tgsrunningdblook.dita" navtitle="Running dblook"></topicref>
 </relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
 <relcell>
-<topicref href="tgs26250.dita" navtitle="Setting the classpath"></topicref>
+<topicref href="tgs26250.dita" navtitle="Manually setting the CLASSPATH environment variable">
+</topicref>
 </relcell>
+<relcell></relcell>
 </relrow>
 <relrow>
 <relcell>
-<topicref href="tgs26250.dita" navtitle="Setting the classpath"></topicref>
+<topicref href="tgssetupverify.dita" navtitle="Verifying the Derby system configuration">
+</topicref>
 </relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
 <relcell>
-<topicref href="cgsusingsysinfo.dita" navtitle="Using the sysinfo tool"></topicref>
-<topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
+<topicref href="cgstutorialintro.dita" navtitle="Self-study tutorial for users new to  Derby">
+</topicref>
 </relcell>
+<relcell></relcell>
 </relrow>
 <relrow>
 <relcell>
-<topicref href="rgslib46043.dita" navtitle="Libraries provided by Derby">
+<topicref href="cwwdactivities.dita" navtitle="Tutorial overview"></topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="twwdactivity1_overview.dita" navtitle="Activity 1: Run SQL using the embedded driver">
 </topicref>
 </relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
 <relcell>
-<topicref href="rgslib56653.dita" navtitle=" Libraries not provided by Derby">
+<topicref href="twwdactivity1_Setup.dita" navtitle="Creating a directory and copying scripts into the directory">
 </topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="twwdactivity1.dita" navtitle="Creating a Derby database and running SQL statements">
+</topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="twwdactivity2.dita" navtitle="Activity 2: Run SQL using the client driver">
+</topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="twwdactivity3_Setup.dita" navtitle="Activity 3: Run a JDBC program using the embedded driver">
+</topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rwwdactivity3.dita" navtitle="The gsEmbedded program"></topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="twwdactivity4.dita" navtitle="Activity 4: Create and run a JDBC program using the client driver and Network Server">
+</topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="cwwdsummary.dita" navtitle="What next with  Derby?"></topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="cgsquck19524.dita" navtitle="Quick start guide for experienced JDBC users">
+</topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="cgsquck70629.dita" navtitle="Environments in which Derby can run">
+</topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="cgsquck35643.dita" navtitle="Embedded environment"></topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="cgsquck13780.dita" navtitle="Client/server environment"></topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rgsquck35368.dita" navtitle="Available drivers"></topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rgsquck30197.dita" navtitle="Database connection URL"></topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rgsdocs37966.dita" navtitle="Documentation conventions"></topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rgsdocs99397.dita" navtitle="Terminology"></topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rgsdocs10012.dita" navtitle="SQL syntax"></topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rgsdocs18277.dita" navtitle="Typographical conventions"></topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="cgslib19524.dita" navtitle="Derby libraries and scripts: complete reference ">
+</topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rgslib46043.dita" navtitle="Libraries provided by Derby">
+</topicref>
+</relcell>
+<relcell>
 <topicref href="rgslib27507.dita" navtitle="Scripts included with Derby">
 </topicref>
+<topicref href="rgslib56653.dita" navtitle=" Libraries not provided by Derby">
+</topicref>
 </relcell>
 </relrow>
 <relrow>
@@ -126,23 +297,58 @@
 </topicref>
 </relcell>
 </relrow>
+<relrow>
+<relcell>
+<topicref href="rgslib27507.dita" navtitle="Scripts included with Derby">
+</topicref>
+</relcell>
+<relcell></relcell>
+</relrow>
 </reltable>
 <topicref href="rgscopyright.dita" navtitle="Copyright"></topicref>
 <topicref href="rgslicense.dita" navtitle="License"></topicref>
-<topicref href="cgsintro.dita" navtitle="Introducing Derby">
+<topicref href="cgsintro.dita" navtitle="Introduction to Derby">
 <topicref href="cgsintdo.dita" navtitle="Deployment options"></topicref>
 <topicref href="cgsintsr.dita" navtitle="System requirements"></topicref>
-<topicref href="rgsdocs17307.dita" navtitle="The Derby library"></topicref>
+<topicref href="rgsdocs17307.dita" navtitle="Product documentation for Derby">
+</topicref>
 </topicref>
 <topicref href="cgsinsta.dita" navtitle="Installing and working with Derby">
 <topicref href="cgsinstallingderby.dita" navtitle="Installing Derby"></topicref>
-<topicref href="tgssetupjavaenvir.dita" navtitle=" Setting up your Java environment">
+<topicref href="tgssetupenvironment.dita" navtitle="Setting up your environment">
+<topicref href="tgsruntoolsutils.dita" navtitle="Choosing a method to run the Derby tools and startup utilities">
+</topicref>
+<topicref href="tgssetupjavaenvir.dita" navtitle=" Setting the environment variables">
+</topicref>
+<topicref href="rgsderbyrunjarsyntax.dita" navtitle="Syntax for the derbyrun.jar file">
+</topicref>
+<topicref href="tgs26250.dita" navtitle="Manually setting the CLASSPATH environment variable">
+</topicref>
 </topicref>
 <topicref href="cgsusingtoolsutils.dita" navtitle="Using the Derby tools and startup utilities">
-<topicref href="cgsusingsysinfo.dita" navtitle="Using the sysinfo tool"></topicref>
+<topicref href="tgsrunningsysinfo.dita" navtitle="Running sysinfo"></topicref>
 <topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
-<topicref href="tgs26250.dita" navtitle="Setting the classpath"></topicref>
+<topicref href="tgsrunningdblook.dita" navtitle="Running dblook"></topicref>
+</topicref>
+<topicref href="tgssetupverify.dita" navtitle="Verifying the Derby system configuration">
+</topicref>
+</topicref>
+<topicref href="cgstutorialintro.dita" navtitle="Self study tutorial for users new to Derby">
+<topicref href="cwwdactivities.dita" navtitle="Tutorial overview"></topicref>
+<topicref href="twwdactivity1_overview.dita" navtitle="Activity 1: Run SQL using the Embedded driver">
+<topicref href="twwdactivity1_Setup.dita" navtitle="Creating a directory and copying scripts into the directory">
 </topicref>
+<topicref href="twwdactivity1.dita" navtitle="Creating a Derby database and running SQL statements">
+</topicref>
+</topicref>
+<topicref href="twwdactivity2.dita" navtitle="Activity 2: Run SQL using the Client Driver">
+</topicref>
+<topicref href="twwdactivity3_Setup.dita" navtitle="Activity 3: Run a JDBC program using the Embedded driver">
+<topicref href="rwwdactivity3.dita" navtitle="The WwdEmbedded program"></topicref>
+</topicref>
+<topicref href="twwdactivity4.dita" navtitle="Activity 4: Create and run a JDBC program using the Client driver and
+Network Server"></topicref>
+<topicref href="cwwdsummary.dita" navtitle="What next with Derby"></topicref>
 </topicref>
 <topicref href="cgsquck19524.dita" navtitle="Quick start guide for experienced JDBC users">
 <topicref href="cgsquck70629.dita" navtitle="Environments in which Derby can run">
@@ -159,8 +365,6 @@
 </topicref>
 <topicref href="cgslib19524.dita" navtitle="Derby libraries and scripts: complete reference ">
 <topicref href="rgslib46043.dita" navtitle="Libraries provided by Derby">
-</topicref>
-<topicref href="rgslib56653.dita" navtitle=" Libraries not provided by Derby">
 </topicref>
 <topicref href="rgslib27507.dita" navtitle="Scripts included with Derby">
 </topicref>

Modified: db/derby/docs/trunk/src/getstart/gsconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/gsconrefs.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/gsconrefs.dita (original)
+++ db/derby/docs/trunk/src/getstart/gsconrefs.dita Tue Jun 12 16:24:36 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
- 
+
 <!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
  "../dtd/ditabase.dtd">
 <!--  
@@ -37,6 +37,7 @@
 <title>Version and release numbers</title>
 <conbody>
 <p><ph id="fullversionnumber">Version 10.2</ph></p>
+<p><ph id="shortversionnumber">10.2</ph></p>
 </conbody>
 </concept>
 <concept id="pub" xml:lang="en-us">

Added: db/derby/docs/trunk/src/getstart/rgsderbyrunjarsyntax.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/rgsderbyrunjarsyntax.dita?view=auto&rev=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsderbyrunjarsyntax.dita (added)
+++ db/derby/docs/trunk/src/getstart/rgsderbyrunjarsyntax.dita Tue Jun 12 16:24:36 2007
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
+<!--  
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<reference id="rgsderbyrunjarsyntax" xml:lang="en-us">
+<title>Syntax for the derbyrun.jar file</title>
+<shortdesc>The <codeph>derbyrun.jar</codeph> file is a special JAR file that
+simplifies how you invoke the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
+and the Network Server.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm>derbyrun.jar file<indexterm>syntax</indexterm></indexterm>
+<indexterm>derbyrun.jar file<indexterm>classpath</indexterm></indexterm><indexterm>classpath<indexterm>setting
+up</indexterm></indexterm></keywords>
+</metadata></prolog>
+<refbody>
+<section>With the <codeph>derbyrun.jar</codeph> file, you can run the <ph
+conref="../conrefs.dita#prod/productshortname"></ph> tools and utilities using
+shortened names and you do not need to set the java CLASSAPATH environment
+variable. The <codeph>derbyrun.jar</codeph> file must be in the same folder
+as the other <ph conref="../conrefs.dita#prod/productshortname"></ph> JAR
+files.</section>
+<section><title>Syntax</title>The syntax for using <codeph>derbyrun.jar</codeph> for
+each of the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
+is as follows: <simpletable relcolwidth="1* 3*">
+<sthead>
+<stentry>Operating System</stentry>
+<stentry>Command</stentry>
+</sthead>
+<strow>
+<stentry>UNIX (Korn Shell)</stentry>
+<stentry><codeblock>java -jar $DERBY_HOME/lib/derbyrun.jar ij [-p <i>propertiesfile</i>] [<i>sql_script</i>] 
+java -jar $DERBY_HOME/lib/derbyrun.jar sysinfo [-cp ...] [-cp help]
+
+java -jar $DERBY_HOME/lib/derbyrun.jar dblook [<i>arg</i>]* (or no arguments for usage) 
+java -jar $DERBY_HOME/lib/derbyrun.jar server [<i>arg</i>]* (or no arguments for usage) </codeblock></stentry>
+</strow>
+<strow>
+<stentry>Windows</stentry>
+<stentry><codeblock>java -jar %DERBY_HOME%\lib\derbyrun.jar ij [-p <i>propertiesfile</i>] [<i>sql_script</i>] 
+java -jar %DERBY_HOME%\lib\derbyrun.jar sysinfo [-cp ...] [-cp help] 
+java -jar %DERBY_HOME%\lib\derbyrun.jar dblook [<i>arg</i>]* (or no arguments for usage) 
+java -jar %DERBY_HOME%\lib\derbyrun.jar server [<i>arg</i>]* (or no arguments for usage) </codeblock></stentry>
+</strow>
+</simpletable><p>To see this syntax reminder, run the command  <codeph>java
+-jar derbyrun.jar</codeph> with no arguments.</p></section>
+<section><title>Additional information</title><p>The <codeph>server</codeph> argument
+is a shortcut for running the  <codeph>NetworkServerControl</codeph> tool.
+For details on using this tool, see the <cite><ph conref="../conrefs.dita#pub/citadmin"></ph></cite>. </p><p>For
+more information on using <codeph>derbyrun.jar</codeph> to run the  <codeph>ij</codeph>, <codeph>sysinfo</codeph>,
+and <codeph>dblook</codeph>  tools, see the <cite><ph conref="../conrefs.dita#pub/citutilities"></ph></cite>.</p></section>
+</refbody>
+</reference>

Propchange: db/derby/docs/trunk/src/getstart/rgsderbyrunjarsyntax.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/docs/trunk/src/getstart/rgsdocs17307.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/rgsdocs17307.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsdocs17307.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsdocs17307.dita Tue Jun 12 16:24:36 2007
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!--  
@@ -18,46 +19,66 @@
 limitations under the License.
 -->
 <reference id="rgsdocs17307" xml:lang="en-us">
-<title>The Derby library</title>
-<shortdesc>The <ph conref="gsconrefs.dita#prod/productshortname"></ph> library includes the <ph conref="gsconrefs.dita#prod/productshortname"></ph> manuals and API reference.</shortdesc>
+<title>Product documentation for Derby</title>
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> product
+documentation consists of the <ph conref="../conrefs.dita#prod/productshortname"></ph> manuals
+and the API reference.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm>documentation<indexterm>description</indexterm></indexterm>
+<indexterm>manuals<indexterm>description</indexterm></indexterm><indexterm>API
+reference<indexterm>description</indexterm></indexterm><indexterm>javadoc<indexterm>description</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <refbody>
 <section> <dl><dlentry>
-<dt><ph conref="gsconrefs.dita#pub/citdevelop"></ph></dt>
-<dd><p>Describes the functionality and features of <ph conref="gsconrefs.dita#prod/productshortname"></ph> common
-to all deployments, such as <ph conref="gsconrefs.dita#prod/productshortname"></ph>'s
-JDBC and SQL specifics, deploying <ph conref="gsconrefs.dita#prod/productshortname"></ph> applications,
-security, and other advanced features.</p></dd>
-</dlentry><dlentry>
-<dt><ph conref="gsconrefs.dita#pub/citref"></ph></dt>
-<dd><p>Documents <ph conref="gsconrefs.dita#prod/productshortname"></ph>'s
-implementation of the SQL language. Also provides reference information for <ph
-conref="gsconrefs.dita#prod/productshortname"></ph>'s JDBC and JTA implementations,
-keywords, system tables, properties, and <i>SQLExceptions</i>. </p></dd>
-</dlentry><dlentry>
-<dt><ph conref="gsconrefs.dita#pub/cittuning"></ph></dt>
-<dd><p>Explains how to configure and tune <ph conref="gsconrefs.dita#prod/productshortname"></ph> through
-properties and provides reference information on properties. It also offers
-performance tips, an in-depth discussion of performance, and information about
-the <ph conref="gsconrefs.dita#prod/productshortname"></ph> optimizer.</p></dd>
-</dlentry><dlentry>
-<dt><ph conref="gsconrefs.dita#pub/citutilities"></ph></dt>
-<dd><p>A guide for working with the <ph conref="gsconrefs.dita#prod/productshortname"></ph> tools
-such as <codeph>ij</codeph>, and more advanced utilities such as import/export
-and the database class loader.</p></dd>
-</dlentry><dlentry>
-<dt><ph conref="gsconrefs.dita#pub/citadmin"></ph></dt>
-<dd><p>Part One of this guide discusses configuration of servers, how to program
-client applications, and database administration.</p><p>In addition, some
-systems might require administrative tasks such as backing up databases. These
-tasks are independent of any server framework but are unique to multi-user
-or large systems. </p><p>Part Two of this guide discusses administrative issues
-such as backups and debugging deadlocks.</p></dd>
-</dlentry><dlentry>
-<dt><ph conref="gsconrefs.dita#prod/productshortname"></ph> API javadoc </dt>
-<dd><p>Automatically generated for all public <ph conref="gsconrefs.dita#prod/productshortname"></ph> classes.
-(No javadoc is provided for the JDBC API, which is part of the Java 2 Platform,
-Standard Edition) For more information about the classes in the API, see the <cite><ph
-conref="gsconrefs.dita#pub/citref"></ph></cite>.</p></dd>
-</dlentry></dl></section>
+<dt><ph conref="../conrefs.dita#pub/citgetstart"></ph></dt>
+<dd>Describes how to install and configure <ph conref="../conrefs.dita#prod/productshortname"></ph>.
+Includes a self-study tutorial for users new to Derby and a quick-start guide
+for experienced JDBC users. This guide introduces the <codeph>dblook</codeph>, <codeph>ij</codeph>,
+and <codeph>sysinfo</codeph> tools, and the libraries and scripts that are
+included with <ph conref="../conrefs.dita#prod/productshortname"></ph>.</dd>
+</dlentry><dlentry>
+<dt><ph conref="../conrefs.dita#pub/citdevelop"></ph></dt>
+<dd>Describes the functionality and features of <ph conref="../conrefs.dita#prod/productshortname"></ph> common
+to all deployments, such as <ph conref="../conrefs.dita#prod/productshortname"></ph>'s
+JDBC and SQL specifics, deploying <ph conref="../conrefs.dita#prod/productshortname"></ph> applications,
+security, and other advanced features.</dd>
+</dlentry><dlentry>
+<dt><ph conref="../conrefs.dita#pub/citref"></ph></dt>
+<dd>Documents the implementation of the SQL language in <ph conref="../conrefs.dita#prod/productshortname"></ph>.
+This guide provides reference information about the JDBC and JTA implementations,
+keywords, system tables, properties, and <i>SQLExceptions</i> in <ph conref="../conrefs.dita#prod/productshortname"></ph>.</dd>
+</dlentry><dlentry>
+<dt><ph conref="../conrefs.dita#pub/cittuning"></ph></dt>
+<dd>Explains how to configure and tune <ph conref="../conrefs.dita#prod/productshortname"></ph> through
+properties and provides reference information on properties. This guide also
+offers performance tips, an in-depth discussion of performance, and information
+about the <ph conref="../conrefs.dita#prod/productshortname"></ph> optimizer.</dd>
+</dlentry><dlentry>
+<dt><ph conref="../conrefs.dita#pub/citutilities"></ph></dt>
+<dd>Describes how to use the <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
+such as <codeph>ij</codeph>, more advanced utilities such as import and export,
+and the database class loader.</dd>
+</dlentry><dlentry>
+<dt><ph conref="../conrefs.dita#pub/citadmin"></ph></dt>
+<dd>Part One of this guide discusses configuring servers, how to program client
+applications, and database administration. In addition, some systems might
+require administrative tasks such as backing up databases. These tasks are
+independent of any server framework but are unique to multi-user or large
+systems. <p>Part Two of this guide discusses administrative issues such as
+backups and debugging deadlocks.</p></dd>
+</dlentry><dlentry>
+<dt><ph conref="../conrefs.dita#prod/productshortname"></ph> API Reference</dt>
+<dd>An API Reference that is automatically generated for all public <ph conref="../conrefs.dita#prod/productshortname"></ph> classes.
+No reference is provided for the JDBC API, which is part of the Java 2 Platform,
+Standard Edition. For more information about the classes in the API, see the <cite><ph
+conref="../conrefs.dita#pub/citref"></ph></cite>.</dd>
+</dlentry></dl><p>You can access the <ph conref="../conrefs.dita#vers/fullversionnumber"></ph> manuals
+and API Reference from the <xref format="html" href="http://db.apache.org/derby/manuals/index.html"
+importance="high" scope="external">Apache Derby: Documentation</xref> page
+on the Apache Derby Web site. The product documentation is also installed
+with <ph conref="../conrefs.dita#prod/productshortname"></ph>. The manuals
+are installed in the <filepath>docs</filepath> subdirectory and the API Reference
+is installed in the <filepath>javadoc</filepath> subdirectory.</p></section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/getstart/rgsdocs18277.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/rgsdocs18277.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsdocs18277.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsdocs18277.dita Tue Jun 12 16:24:36 2007
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!--  
@@ -23,7 +24,7 @@
 elements of the SQL language, operating system commands, and the Java programming
 language.</shortdesc>
 <refbody>
-<section><p><table pgwide="1" frame="all"><title><ph conref="gsconrefs.dita#prod/productshortname"></ph> typographical
+<section><p><table frame="all" pgwide="1"><title><ph conref="../conrefs.dita#prod/productshortname"></ph> typographical
 conventions</title>
 <tgroup cols="3" colsep="1" rowsep="1"><colspec colname="2" colnum="1" colwidth="35*"/>
 <colspec colname="COLSPEC0" colnum="2" colwidth="23*"/><colspec colname="3"
@@ -44,7 +45,7 @@
 <row>
 <entry colname="2">File and directory names</entry>
 <entry colname="COLSPEC0">Italic</entry>
-<entry colname="3"><i>C:\<ph conref="gsconrefs.dita#prod/productlowercase"></ph></i></entry>
+<entry colname="3"><i>C:\<ph conref="../conrefs.dita#prod/productlowercase"></ph></i></entry>
 </row>
 <row>
 <entry colname="2">Dictionary objects</entry>
@@ -55,7 +56,7 @@
 <entry colname="2">In syntax, items that you do not type exactly as they appear,
 but replace with the appropriate name </entry>
 <entry colname="COLSPEC0">Italic</entry>
-<entry colname="3"> <codeph>CREATE TABLE <i>tableName</i></codeph></entry>
+<entry colname="3"> <codeph>CREATE TABLE <varname>tableName</varname></codeph></entry>
 </row>
 <row>
 <entry colname="2">SQL examples</entry>

Modified: db/derby/docs/trunk/src/getstart/rgsdocs37966.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/rgsdocs37966.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsdocs37966.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsdocs37966.dita Tue Jun 12 16:24:36 2007
@@ -20,7 +20,7 @@
 <reference id="rgsdocs37966" xml:lang="en-us">
 <title>Documentation conventions</title>
 <shortdesc> This section describes the terminology, syntax, and typographical
-conventions of the <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation.</shortdesc>
+conventions of the <ph conref="../conrefs.dita#prod/productshortname"></ph> documentation.</shortdesc>
 <refbody>
 <section><p></p></section>
 </refbody>

Modified: db/derby/docs/trunk/src/getstart/rgsdocs99397.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/rgsdocs99397.dita?view=diff&rev=546665&r1=546664&r2=546665
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgsdocs99397.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgsdocs99397.dita Tue Jun 12 16:24:36 2007
@@ -19,9 +19,9 @@
 -->
 <reference id="rgsdocs99397" xml:lang="en-us">
 <title>Terminology</title>
-<shortdesc>The <ph conref="gsconrefs.dita#prod/productshortname"></ph> documentation
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> documentation
 uses the specialized term <codeph>environment</codeph> to describe the method
-your application uses to interact with <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</shortdesc>
+your application uses to interact with <ph conref="../conrefs.dita#prod/productshortname"></ph>.</shortdesc>
 <refbody>
 <section><p>An environment is sometimes referred to as a <i>framework</i>.
 The two types of environments are the <i>embedded environment</i> and the <i>client/server



Mime
View raw message