You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2006/09/08 18:36:16 UTC
svn commit: r441555 [2/3] - in /db/derby/docs/branches/10.2: ./ lib/
src/adminguide/ src/devguide/ src/pt_BR/ref/ src/ref/ src/tools/
src/workingwithderby/
Modified: db/derby/docs/branches/10.2/src/tools/ctoolsijtools26429.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ctoolsijtools26429.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ctoolsijtools26429.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ctoolsijtools26429.dita Fri Sep 8 09:36:07 2006
@@ -19,15 +19,15 @@
-->
<concept id="ctoolsijtools26429" xml:lang="en-us">
<title>What are the Derby tools and utilities?</title>
-<shortdesc>This section covers some basics about Java, <ph conref="toolsconrefs.dita#prod/productshortname"></ph>,
-and JDBC for new users or infrequent users (such as those who only use the <ph
-conref="toolsconrefs.dita#prod/productshortname"></ph> tools and are not developing
-applications).</shortdesc>
+<shortdesc>The <ph conref="toolsconrefs.dita#prod/productshortname"></ph>
+tools and utilities are a set of routines supplied with <ph conref="toolsconrefs.dita#prod/productshortname"></ph> that
+are typically used to setup and update a <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database.</shortdesc>
<prolog><metadata>
<keywords><indexterm>Tools<indexterm>how to use</indexterm></indexterm></keywords>
</metadata></prolog>
<conbody>
-<p>For more complete information on these topics, see the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.
+<p>For more complete information on developing a system using <ph conref="toolsconrefs.dita#prod/productshortname"></ph>,
+see the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.
</p>
</conbody>
</concept>
Modified: db/derby/docs/branches/10.2/src/tools/ctoolsijtools30948.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ctoolsijtools30948.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ctoolsijtools30948.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ctoolsijtools30948.dita Fri Sep 8 09:36:07 2006
@@ -37,10 +37,10 @@
be used in an embedded or a client/server environment.</p></li>
<li><i>The import and export utilities</i> <p>These server-side utilities
allow you to import data directly from files into tables and to export data
-from tables into files. (You can use the utilities in a client/server environment.)</p></li>
-<li><i>Database class utilities</i> <p>These utilities allow you to store
-application logic in a database and to boot an application using the stored
-classes.</p></li>
+from tables into files. Server-side utilities can be in a client/server environment
+but require that all files referenced be on the Server machine.</p></li>
+<li><i>Database class loading utilities</i> <p>These utilities allow you
+to store application logic in a database.</p></li>
<li><i><ph><indexterm>sysinfo<indexterm>description</indexterm></indexterm></ph>sysinfo</i>
<p><codeph>sysinfo</codeph> provides information about your version of <ph
conref="toolsconrefs.dita#prod/productshortname"></ph> and your environment.</p></li>
Modified: db/derby/docs/branches/10.2/src/tools/ctoolsijtools37363.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ctoolsijtools37363.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ctoolsijtools37363.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ctoolsijtools37363.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,15 +17,15 @@
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 xml:lang="en-us" id="ctoolsijtools37363">
-<title>JVM and classpath for Derby tools</title>
-<prolog>
-</prolog>
+<concept id="ctoolsijtools37363" xml:lang="en-us">
+<title>Environment setup and the Derby tools</title>
+<prolog></prolog>
<conbody>
-<p><codeph>ij</codeph>, <codeph>sysinfo</codeph>, and <codeph>dblook</codeph> are tools that can be used in an embedded
-or a client/server environment. The import and export utilities and database
-class utilities are database-side utilities, which means that they run in
-the same JVM as <ph conref="toolsconrefs.dita#prod/productshortname"></ph>, although the import and export utilities can
-also be used in a client/server environment.</p>
-</conbody></concept>
+<p><codeph>ij</codeph>, <codeph>sysinfo</codeph>, and <codeph>dblook</codeph> are
+tools that can be used in an embedded or a client/server environment. The
+import and export utilities and database class loading utilities are database-side
+utilities, which means that they run in the same JVM as <ph conref="toolsconrefs.dita#prod/productshortname"></ph> (e.g.
+on the Server). This means when used in a client/server environment all files
+imported, exported, or loaded must be local to the Server machine.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/branches/10.2/src/tools/ctoolspre23947.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ctoolspre23947.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ctoolspre23947.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ctoolspre23947.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,38 +17,34 @@
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 xml:lang="en-us" id="ctoolspre23947">
+<concept id="ctoolspre23947" xml:lang="en-us">
<title>How this guide is organized</title>
-<prolog>
-</prolog>
+<prolog></prolog>
<conbody>
-<p>This guide includes the following sections:
-<ul>
-<li><xref href="ctoolsijtools26429.dita#ctoolsijtools26429"/>
-<p>Overview of the tools and
-utilities, and <ph conref="toolsconrefs.dita#prod/productshortname"></ph> and JDBC basics for new or infrequent users.</p></li>
-<li><xref href="ctoolsij34525.dita#ctoolsij34525"/>
-<p>How to get started with ij,
-a JDBC and SQL scripting tool.</p></li>
-<li><xref href="rtoolsijpropref29864.dita#rtoolsijpropref29864"/>
-<p>Reference for ij properties.</p></li>
-<li><xref href="rtoolsijcomref25570.dita#rtoolsijcomref25570"/>
-<p>Reference for ij commands
-and errors.</p></li>
-<li><xref href="ctoolsimport16245.dita#ctoolsimport16245"/>
-<p>Reference and how-to instructions
-for using bulk import and export.</p></li>
-<li><xref href="rtoolssysinfo41288.dita#rtoolssysinfo41288"/>
-<p>Reference information
-on the utility that provides information about your <ph conref="toolsconrefs.dita#prod/productshortname"></ph> environment.</p></li>
-<li><xref href="ctoolsdblook.dita#ctoolsdblook"/>
-<p>dblook is <ph conref="toolsconrefs.dita#prod/productshortname"></ph>'s Data Definition
-Language (DDL) Generation Utility, which is more informally called a schema
-dump tool. It is a simple utility that dumps the DDL of a user-specified database
-to either a console or to a file. The generated DDL can then be used to recreate
+<p>This guide includes the following sections: <ul>
+<li><xref href="ctoolsijtools26429.dita#ctoolsijtools26429"></xref> <p>Overview
+of the tools and utilities, and <ph conref="toolsconrefs.dita#prod/productshortname"></ph> and
+JDBC basics for new or infrequent users.</p></li>
+<li><xref href="ctoolsij34525.dita#ctoolsij34525"></xref> <p>How to get
+started with ij, a JDBC and SQL scripting tool.</p></li>
+<li><xref href="rtoolsijpropref29864.dita#rtoolsijpropref29864"></xref> <p>Reference
+for ij properties.</p></li>
+<li><xref href="rtoolsijcomref25570.dita#rtoolsijcomref25570"></xref> <p>Reference
+for ij commands and errors.</p></li>
+<li><xref href="ctoolsimport16245.dita#ctoolsimport16245"></xref> <p>Reference
+and how-to instructions for using bulk import and export.</p></li>
+<li><xref href="rtoolsijcomref25570.dita#rtoolsijcomref25570"></xref> <p>Syntax
+for executing the built-in procedures for storing jar files in the database.</p></li>
+<li><xref href="rtoolssysinfo41288.dita#rtoolssysinfo41288"></xref> <p>Reference
+information on the utility that provides information about your <ph conref="toolsconrefs.dita#prod/productshortname"></ph> environment.</p></li>
+<li><xref href="ctoolsdblook.dita#ctoolsdblook"></xref> <p>dblook is <ph
+conref="toolsconrefs.dita#prod/productshortname"></ph>'s Data Definition Language
+(DDL) Generation Utility, which is more informally called a schema dump tool.
+It is a simple utility that dumps the DDL of a user-specified database to
+either a console or to a file. The generated DDL can then be used to recreate
all or parts of a database, view a subset of a database's objects (for example,
those which pertain to specific tables or schemas), or document a database's
schema.</p></li>
</ul></p>
-</conbody></concept>
+</conbody>
+</concept>
Modified: db/derby/docs/branches/10.2/src/tools/derbytools.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/derbytools.ditamap?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/derbytools.ditamap (original)
+++ db/derby/docs/branches/10.2/src/tools/derbytools.ditamap Fri Sep 8 09:36:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "../dtd/map.dtd">
+<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "../dtd/map.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -30,45 +29,35 @@
</topicmeta>
<topicref href="rtoolscopyright.dita" navtitle="Copyright"></topicref>
<topicref collection-type="family" href="ctoolspre29520.dita" navtitle="About this guide">
-<topicref href="ctoolspre11181.dita" navtitle="Purpose of this document">
-</topicref>
+<topicref href="ctoolspre11181.dita" navtitle="Purpose of this document"></topicref>
<topicref href="ctoolspre22460.dita" navtitle="Audience"></topicref>
-<topicref href="ctoolspre23947.dita" navtitle="How this guide is organized">
-</topicref>
+<topicref href="ctoolspre23947.dita" navtitle="How this guide is organized"></topicref>
</topicref>
<topicref collection-type="family" href="ctoolsijtools26429.dita" navtitle="What are the Derby tools and utilities?">
<topicref collection-type="family" href="ctoolsijtools30948.dita" navtitle="Overview">
-<topicref collection-type="family" href="ctoolsijtools37363.dita" navtitle="JVM and classpath for Derby tools">
-<topicref collection-type="family" href="ctools1003034.dita" navtitle="Java 2 Platform, Standard Edition, Version 1.3">
-</topicref>
+<topicref collection-type="family" href="ctoolsijtools37363.dita" navtitle="Environment setup and the Derby tools">
+<topicref collection-type="family" href="ctools1003034.dita" navtitle="Java 2 Platform, Standard Edition, Version 1.3"></topicref>
<topicref href="rtools1003161.dita" navtitle="Classpath"></topicref>
</topicref>
</topicref>
-<topicref href="ctoolsijtools25085.dita" navtitle="About Derby databases">
-</topicref>
-<topicref href="ctoolsijtools20118.dita" navtitle="JDBC basics">
-<topicref href="rtoolsijtools16879.dita" navtitle="JDBC drivers overview">
-</topicref>
-<topicref href="ctoolsijtools16011.dita" navtitle="Database connection URLs">
-</topicref>
+<topicref href="ctoolsijtools25085.dita" navtitle="About Derby databases"></topicref>
+<topicref href="ctoolsijtools20118.dita" navtitle="JDBC connection basics">
+<topicref href="rtoolsijtools16879.dita" navtitle="JDBC drivers overview"></topicref>
+<topicref href="ctoolsijtools16011.dita" navtitle="Database connection URLs"></topicref>
</topicref>
<topicref collection-type="family" href="ctoolsijtools11318.dita" navtitle="Tools and localization">
<topicref href="ctools1004764.dita" navtitle="About locales"></topicref>
<topicref href="ctoolsijtools45180.dita" navtitle="Database territory"></topicref>
-<topicref href="ctoolsijtools70959.dita" navtitle="Specifying an alternate codeset">
-</topicref>
-<topicref collection-type="family" href="ctoolsijtools90477.dita" navtitle="Formatting display of locale-sensitive data">
-</topicref>
+<topicref href="ctoolsijtools70959.dita" navtitle="Specifying an alternate codeset"></topicref>
+<topicref collection-type="family" href="ctoolsijtools90477.dita" navtitle="Formatting display of locale-sensitive data"></topicref>
</topicref>
</topicref>
<topicref collection-type="family" href="ctoolsij34525.dita" navtitle="Using ij">
<topicref href="ttoolsij11815.dita" navtitle="Starting ij"></topicref>
-<topicref href="ttoolsij30600.dita" navtitle="Starting ij using properties">
-</topicref>
+<topicref href="ttoolsij30600.dita" navtitle="Starting ij using properties"></topicref>
<topicref href="ctoolsij32837.dita" navtitle="Getting started with ij">
<topicref collection-type="family" href="ttoolsij97656.dita" navtitle="Connecting to a Derby database">
-<topicref href="rtoolsdrvrnmeurl.dita" navtitle="Specifying the driver name and database connection URL">
-</topicref>
+<topicref href="rtoolsdrvrnmeurl.dita" navtitle="Specifying the driver name and database connection URL"></topicref>
</topicref>
<topicref collection-type="family" href="ctoolsij25986.dita" navtitle="Using ij commands">
<topicref href="ctoolsij12001.dita" navtitle="Other uses for ij"></topicref>
@@ -77,19 +66,15 @@
</topicref>
</topicref>
<topicref collection-type="family" href="rtoolsijpropref29864.dita" navtitle="ij properties reference">
-<topicref href="rtoolsijpropref10135.dita" navtitle="ij.connection.connectionName">
-</topicref>
+<topicref href="rtoolsijpropref10135.dita" navtitle="ij.connection.connectionName"></topicref>
<topicref href="rtoolsijpropref28146.dita" navtitle="ij.database"></topicref>
-<topicref href="rtoolsijproprefdatasource.dita" navtitle="ij.datasource">
-</topicref>
+<topicref href="rtoolsijproprefdatasource.dita" navtitle="ij.dataSource"></topicref>
<topicref href="rtoolsijpropref41073.dita" navtitle="ij.driver"></topicref>
-<topicref href="rtoolsijpropref28788.dita" navtitle="ij.maximumDisplayWidth">
-</topicref>
+<topicref href="rtoolsijpropref28788.dita" navtitle="ij.maximumDisplayWidth"></topicref>
<topicref href="rtoolsijpropref32585.dita" navtitle="ij.outfile"></topicref>
<topicref href="rtoolsijproprefpassword.dita" navtitle="ij.password"></topicref>
<topicref href="rtoolsijpropref35032.dita" navtitle="ij.protocol"></topicref>
-<topicref href="rtoolsijpropref12236.dita" navtitle="ij.protocol.protocolName">
-</topicref>
+<topicref href="rtoolsijpropref12236.dita" navtitle="ij.protocol.protocolName"></topicref>
<topicref href="rtoolsijpropref25589.dita" navtitle="ij.showErrorCode"></topicref>
<topicref href="rtoolsijpropref38481.dita" navtitle="ij.URLCheck"></topicref>
<topicref href="rtoolsijproprefuser.dita" navtitle="ij.user"></topicref>
@@ -97,11 +82,9 @@
</topicref>
<topicref collection-type="family" href="rtoolsijcomref25570.dita" navtitle="ij commands and errors reference">
<topicref href="ctoolsijcomref23268.dita" navtitle="ij commands">
-<topicref href="rtoolsijcomref1003067.dita" navtitle="Conventions for ij examples">
-</topicref>
+<topicref href="rtoolsijcomref1003067.dita" navtitle="Conventions for ij examples"></topicref>
<topicref collection-type="family" href="ctoolsijcomref15645.dita" navtitle="ij SQL command behavior">
-<topicref href="rtoolsijcomref1003444.dita" navtitle="ij command example">
-</topicref>
+<topicref href="rtoolsijcomref1003444.dita" navtitle="ij command example"></topicref>
</topicref>
</topicref>
<topicref href="rtoolsijcomref94092.dita" navtitle="Absolute"></topicref>
@@ -119,13 +102,11 @@
<topicref href="rtoolsijcomref33358.dita" navtitle="Exit"></topicref>
<topicref href="rtoolsijcomref61708.dita" navtitle="First"></topicref>
<topicref href="rtoolsijcomref36618.dita" navtitle="Get Cursor"></topicref>
-<topicref href="rtoolsijcomref62772.dita" navtitle="Get Scroll Insensitive Cursor">
-</topicref>
+<topicref href="rtoolsijcomref62772.dita" navtitle="Get Scroll Insensitive Cursor"></topicref>
<topicref href="rtoolsijcomref10316.dita" navtitle="Help"></topicref>
<topicref href="rtoolsijcomref53869.dita" navtitle="Last"></topicref>
<topicref href="rtoolsijcomref88554.dita" navtitle="LocalizedDisplay"></topicref>
-<topicref href="rtoolsijcomref12281.dita" navtitle="MaximumDisplayWidth">
-</topicref>
+<topicref href="rtoolsijcomref12281.dita" navtitle="MaximumDisplayWidth"></topicref>
<topicref href="rtoolsijcomref11128.dita" navtitle="Next"></topicref>
<topicref href="rtoolsijcomref12333.dita" navtitle="Prepare"></topicref>
<topicref href="rtoolsijcomref44032.dita" navtitle="Previous"></topicref>
@@ -151,52 +132,38 @@
</topicref>
<topicref collection-type="family" href="ctoolsimport16245.dita" navtitle="Using the bulk import and export procedures">
<topicref collection-type="family" href="ctoolsimport13648.dita" navtitle="Bulk Import/Export overview">
-<topicref href="ctoolsimport98264.dita" navtitle="Options for running the import and export procedures">
-</topicref>
-<topicref href="ctoolsimport27052.dita" navtitle="Bulk import/export requirements and considerations">
-</topicref>
+<topicref href="ctoolsimport98264.dita" navtitle="Options for running the import and export procedures"></topicref>
+<topicref href="ctoolsimport27052.dita" navtitle="Bulk import/export requirements and considerations"></topicref>
</topicref>
<topicref collection-type="family" href="ctoolsimport12925.dita" navtitle="Bulk import and export">
<topicref href="rtoolsimport57005.dita" navtitle="Bulk-Import">
-<topicref href="rtoolsimport64241.dita" navtitle="Arguments to the import procedure">
-</topicref>
+<topicref href="rtoolsimport64241.dita" navtitle="Arguments to the import procedure"></topicref>
</topicref>
<topicref collection-type="family" href="rtoolsimport92876.dita" navtitle="Bulk-Export">
-<topicref href="rtoolsexportarguements.dita" navtitle="Arguments to the export procedure">
-</topicref>
-</topicref>
-<topicref href="rtoolsimport91458.dita" navtitle="Examples of bulk import and export">
-</topicref>
-<topicref href="ctoolsimportidentitycol.dita" navtitle="Importing into tables with identity columns">
-</topicref>
-<topicref href="ctoolsimportjdbc.dita" navtitle="Executing import/export procedures from JDBC">
-</topicref>
-<topicref href="ctoolsimportdefaultformat.dita" navtitle="File format for input and output">
+<topicref href="rtoolsexportarguements.dita" navtitle="Arguments to the export procedure"></topicref>
</topicref>
+<topicref href="rtoolsimport91458.dita" navtitle="Examples of bulk import and export"></topicref>
+<topicref href="ctoolsimportidentitycol.dita" navtitle="Importing into tables with identity columns"></topicref>
+<topicref href="ctoolsimportjdbc.dita" navtitle="Executing import/export procedures from JDBC"></topicref>
+<topicref href="ctoolsimportdefaultformat.dita" navtitle="File format for input and output"></topicref>
<topicref href="ctoolsimportnulls.dita" navtitle="Treatment of NULLS"></topicref>
-<topicref href="rtoolsimportcodeset.dita" navtitle="CODESET values for import/export">
-</topicref>
+<topicref href="rtoolsimportcodeset.dita" navtitle="CODESET values for import/export"></topicref>
</topicref>
</topicref>
<topicref collection-type="family" href="ctoolsstorejardb.dita" navtitle="Storing jar files in a database ">
<topicref href="ttoolsjarload1002986.dita" navtitle="Adding a Jar File"></topicref>
-<topicref href="ttoolsjarload1003059.dita" navtitle="Removing a jar file">
-</topicref>
-<topicref href="ttoolsjarload1003120.dita" navtitle="Replacing a jar file">
-</topicref>
-<topicref href="rtoolsjarload3284.dita" navtitle="Installing a jar example">
-</topicref>
+<topicref href="ttoolsjarload1003059.dita" navtitle="Removing a jar file"></topicref>
+<topicref href="ttoolsjarload1003120.dita" navtitle="Replacing a jar file"></topicref>
+<topicref href="rtoolsjarload3284.dita" navtitle="Installing a jar example"></topicref>
</topicref>
<topicref collection-type="family" href="rtoolssysinfo41288.dita" navtitle="sysinfo">
<topicref href="rtoolssysinfo1002629.dita" navtitle="sysinfo example"></topicref>
-<topicref href="ctoolssysinfo1002931.dita" navtitle="Using sysinfo to check the classpath">
-</topicref>
+<topicref href="ctoolssysinfo1002931.dita" navtitle="Using sysinfo to check the classpath"></topicref>
</topicref>
<topicref collection-type="family" href="ctoolsdblook.dita" navtitle="dblook">
<topicref href="ctoolsusingdblook.dita" navtitle="Using dblook"></topicref>
<topicref href="rtoolsdblookoptions.dita" navtitle="dblook options"></topicref>
-<topicref href="ctoolsgenddldb.dita" navtitle="Generating the DDL for a database">
-</topicref>
+<topicref href="ctoolsgenddldb.dita" navtitle="Generating the DDL for a database"></topicref>
<topicref href="rtoolsdblookexamples.dita" navtitle="dblook examples"></topicref>
</topicref>
<topicref href="rtoolstrademderby.dita" navtitle="Trademarks"></topicref>
Modified: db/derby/docs/branches/10.2/src/tools/rtools1003161.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtools1003161.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtools1003161.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtools1003161.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,24 +17,32 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtools1003161">
+<reference id="rtools1003161" xml:lang="en-us">
<title>Classpath</title>
<prolog><metadata>
-<keywords>
-</keywords>
-</metadata>
-</prolog>
+<keywords></keywords>
+</metadata></prolog>
<refbody>
-<section><p><ph conref="toolsconrefs.dita#prod/productshortname"></ph> classpath requirements:</p></section>
-<section><p>
-<ul>
-<li>To use <codeph>ij</codeph>, you must have <i>derbytools.jar</i> in your classpath. If you are using the embedded driver, you must also
-include <i>derby.jar</i>.</li>
-<li>To use the import and export utilities and the database class utilities,
-you must have <i>derby.jar</i> in your classpath.</li>
-<li>To use sysinfo, either <i>derby.jar</i> or <i>derbytools.jar</i> must be in your classpath.</li>
-<li>To use <ph conref="toolsconrefs.dita#prod/productshortname"></ph> tools from a client with the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> Network Server,
-you must have <i>derbyclient.jar</i> and <i>derbytools.jar</i> in your classpath. See the <cite><ph conref="toolsconrefs.dita#pub/citadmin"></ph></cite> for more information.</li>
+<section><p>To simplify the process of setting up the <i>CLASSPATH</i> environment
+variable to run Derby and the tools a new jarfile,<i>derbyrun.jar</i>, has
+been added to the Derby distribution. This is the only jarfile that needs
+to be in your classpath. The following information is provided for people
+using Derby distributions that do not contain <i>derbyrun.jar</i> or who prefer
+to setup the classpath manually.</p><p>The following lists the files that
+need to be in the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> classpath
+for each tool and configuration:</p></section>
+<section><p> <ul>
+<li>To use <codeph>ij</codeph>, you must have <i>derbytools.jar</i> in your
+classpath. If you are using the embedded driver, you must also include <i>derby.jar</i>.</li>
+<li>To use the import and export utilities and the database class loading
+utilities, you must have <i>derby.jar</i> in your classpath.</li>
+<li>To use sysinfo, either <i>derby.jar</i> or <i>derbytools.jar</i> must
+be in your classpath.</li>
+<li>To use <ph conref="toolsconrefs.dita#prod/productshortname"></ph> tools
+from a client with the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> Network
+Server, you must have <i>derbyclient.jar</i> and <i>derbytools.jar</i> in
+your classpath. See the <cite><ph conref="toolsconrefs.dita#pub/citadmin"></ph></cite> for
+more information.</li>
</ul></p></section>
-</refbody></reference>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsdrvrnmeurl.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsdrvrnmeurl.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsdrvrnmeurl.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsdrvrnmeurl.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,49 +17,53 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsdrvrnmeurl">
-<title>Specifying the driver name and database connection URL</title>
-<prolog>
-</prolog>
+<reference id="rtoolsdrvrnmeurl" xml:lang="en-us">
+<title>The ij Driver name and connection URL</title>
+<prolog></prolog>
<refbody>
-<section><p><xref href="rtoolsdrvrnmeurl.dita#rtoolsdrvrnmeurl/rtoolsij16268"/>, summarizes
-the different ways to specify the driver name and database connection URL.
-<table id="rtoolsij16268" pgwide="1" frame="all">
-<title>Specifying the Driver Name and database connection URL</title>
-<tgroup cols="4" colsep="1" rowsep="1">
-<colspec colnum="1" colname="1" colwidth="31*"/>
-<colspec colnum="2" colname="2" colwidth="19*"/>
-<colspec colnum="3" colname="3" colwidth="29*"/>
-<colspec colnum="4" colname="4" colwidth="20*"/>
+<section><p><xref href="rtoolsdrvrnmeurl.dita#rtoolsdrvrnmeurl/rtoolsij16268"></xref>,
+summarizes the different ways to specify the driver name and database connection
+URL. <table frame="all" id="rtoolsij16268" pgwide="1"><title>Specifying
+the Driver Name and database connection URL</title>
+<tgroup cols="4" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="31*"/>
+<colspec colname="2" colnum="2" colwidth="19*"/><colspec colname="3" colnum="3"
+colwidth="29*"/><colspec colname="4" colnum="4" colwidth="20*"/>
<thead>
<row>
<entry colname="1">Action</entry>
<entry colname="2">System Property</entry>
<entry colname="3"><codeph>ij</codeph> Property</entry>
-<entry colname="4"><codeph>ij</codeph> Command</entry></row>
+<entry colname="4"><codeph>ij</codeph> Command</entry>
+</row>
</thead>
<tbody>
<row>
<entry colname="1">loading the driver implicitly</entry>
-<entry colname="2"/>
+<entry colname="2"></entry>
<entry colname="3"><i><xref href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref></i> (plus
full URL) <i><xref href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref></i> (plus
-full URL) <i><xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref></i><i><xref href="rtoolsijpropref12236.dita#rtoolsijpropref12236">ij.protocol.protocolName</xref></i> (plus protocol
-clause in Connect command)</entry>
-<entry colname="4"><i><xref href="rtoolsijcomref27997.dita#rtoolsijcomref27997">Protocol</xref></i> <i><xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref></i> (plus full
-URL)</entry></row>
+full URL) <i><xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref></i><i><xref
+href="rtoolsijpropref12236.dita#rtoolsijpropref12236">ij.protocol.protocolName</xref></i> (plus
+protocol clause in Connect command)</entry>
+<entry colname="4"><i><xref href="rtoolsijcomref27997.dita#rtoolsijcomref27997">Protocol</xref></i> <i><xref
+href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref></i> (plus
+full URL)</entry>
+</row>
<row>
<entry colname="1">loading the driver explicitly</entry>
<entry colname="2"><i>jdbc.drivers</i></entry>
<entry colname="3">-D<i><xref href="rtoolsijpropref41073.dita#rtoolsijpropref41073">ij.Driver</xref></i></entry>
-<entry colname="4"><i><xref href="rtoolsijcomref39042.dita#rtoolsijcomref39042">Driver</xref></i></entry></row>
+<entry colname="4"><i><xref href="rtoolsijcomref39042.dita#rtoolsijcomref39042">Driver</xref></i></entry>
+</row>
<row>
<entry colname="1">specifying the database connection URL</entry>
-<entry colname="2"/>
-<entry colname="3"><i><xref href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> <xref href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref></i></entry>
-<entry colname="4"><i><xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref></i></entry></row>
+<entry colname="2"></entry>
+<entry colname="3"><i><xref href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> <xref
+href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref></i></entry>
+<entry colname="4"><i><xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref></i></entry>
+</row>
</tbody>
</tgroup>
</table></p></section>
-</refbody></reference>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijcomref12281.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijcomref12281.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijcomref12281.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijcomref12281.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,22 +17,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijcomref12281">
+<reference id="rtoolsijcomref12281" xml:lang="en-us">
<title>MaximumDisplayWidth</title>
<prolog><metadata>
-<keywords><indexterm>MaximumDisplayWidth</indexterm>
-</keywords>
-</metadata>
-</prolog><refbody>
-<refsyn><title>Syntax</title>
-<codeblock><b>MAXIMUMDISPLAYWIDTH <b><i>integer_value</i></b></b></codeblock>
-</refsyn>
-<section><title>Description</title>
-<p>Sets the display width for column to the specified value.</p>
-</section>
-<example><title>Example</title>
-<codeblock>ij> <b>maximumdisplaywidth 3;</b>
+<keywords><indexterm>MaximumDisplayWidth</indexterm></keywords>
+</metadata></prolog>
+<refbody>
+<refsyn><title>Syntax</title> <codeblock><b>MAXIMUMDISPLAYWIDTH <b><i>integer_value</i></b></b></codeblock> </refsyn>
+<section><title>Description</title> <p>Sets the largest display width for
+columns to the specified value. This is generally used to increase the default
+value in order to display large blocks of text.</p> </section>
+<example><title>Example</title> <codeblock>ij> <b>maximumdisplaywidth 3;</b>
ij> <b>VALUES 'NOW IS THE TIME!';</b>
1
---
@@ -39,5 +36,6 @@
ij> VALUES 'NOW IS THE TIME!';
1
----------------
-NOW IS THE TIME!</codeblock>
-</example></refbody></reference>
+NOW IS THE TIME!</codeblock> </example>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijcomref12333.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijcomref12333.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijcomref12333.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijcomref12333.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,29 +17,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijcomref12333">
+<reference id="rtoolsijcomref12333" xml:lang="en-us">
<title>Prepare</title>
<prolog><metadata>
<keywords><indexterm>Prepare</indexterm><indexterm>Prepared statements<indexterm>preparing</indexterm></indexterm>
</keywords>
-</metadata>
-</prolog><refbody>
-<refsyn><title>Syntax</title>
-<codeblock><b>PREPARE <b><i><xref href="rtoolsijcomref40155.dita#rtoolsijcomref40155">Identifier</xref></i></b> AS <b><i><xref href="rtoolsijcomref34110.dita#rtoolsijcomref34110">String</xref></i></b></b></codeblock>
-</refsyn>
-<section><title>Description</title>
-<p>Creates a <i>java.sql.PreparedStatement </i>using the
-value of the String, accessible in <codeph>ij</codeph> by the <i>Identifier</i> given to it. If a prepared statement with that name already
-exists in <codeph>ij</codeph>, an error will be returned and the previous prepared
-statement will remain. Use the <xref href="rtoolsijcomref33373.dita#rtoolsijcomref33373">Remove</xref> command
+</metadata></prolog>
+<refbody>
+<refsyn><title>Syntax</title> <codeblock><b>PREPARE <b><i><xref href="rtoolsijcomref40155.dita#rtoolsijcomref40155">Identifier</xref></i></b> AS <b
+><i><xref href="rtoolsijcomref34110.dita#rtoolsijcomref34110">String</xref></i></b></b></codeblock> </refsyn>
+<section><title>Description</title> <p>Creates a <i>java.sql.PreparedStatement</i> using
+the value of the String, accessible in <codeph>ij</codeph> by the <i>Identifier</i> given
+to it. If a prepared statement with that name already exists in <codeph>ij</codeph>,
+an error will be returned and the previous prepared statement will remain.
+Use the <xref href="rtoolsijcomref33373.dita#rtoolsijcomref33373">Remove</xref> command
to remove the previous statement first. If there are any errors in preparing
-the statement, no prepared statement is created. </p>
-<p>Any SQL statements allowed in the underlying connection's prepared
-statement can be prepared with this command.</p>
-</section>
-<example><title>Example</title>
-<codeblock>ij> <b>prepare seeMenu as 'SELECT * FROM menu';</b>
+the statement, no prepared statement is created. </p> <p>Any SQL statements
+allowed in the underlying connection's prepared statement can be prepared
+with this command.</p> </section>
+<example><title>Example</title> <codeblock>ij> <b>prepare seeMenu as 'SELECT * FROM menu';</b>
ij> <b>execute seeMenu;</b>
COURSE |ITEM |PRICE
-----------------------------------------------
@@ -45,5 +43,6 @@
dessert |creme brulee |6
2 rows selected
-ij> </codeblock>
-</example></refbody></reference>
+ij> </codeblock> </example>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijcomref16653.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijcomref16653.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijcomref16653.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijcomref16653.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,24 +17,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijcomref16653">
+<reference id="rtoolsijcomref16653" xml:lang="en-us">
<title>Comment</title>
-<prolog>
-</prolog><refbody>
-<refsyn><title>Syntax</title>
-<codeblock><b>-- <b><i>Text</i></b></b></codeblock>
-</refsyn>
-<section><title>Description</title>
-<p>You can use a comment anywhere within an <codeph>ij</codeph> command and as permitted
+<prolog></prolog>
+<refbody>
+<refsyn><title>Syntax</title> <codeblock><b>-- <b><i>Text</i></b></b></codeblock> </refsyn>
+<section><title>Description</title> <p>You can use a double dash to create
+a comment anywhere within an <codeph>ij</codeph> command line and as permitted
by the underlying connection within SQL commands. The comment is ended at
-the first new line encountered in the text.</p>
-<p>Comments are ignored on input and have no effect on the output displayed.</p>
-</section>
-<example><title>Example</title>
-<codeblock>ij> -- this is a comment;
+the first new line encountered in the text.</p> <p>Comments are ignored on
+input and have no effect on the output displayed.</p> </section>
+<example><title>Example</title> <codeblock>ij> -- this is a comment;
-- the semicolons in the comment are not taken as the end
-- of the command; for that, we put it outside the --:
<b>;</b>
-ij> </codeblock>
-</example></refbody></reference>
+ij> </codeblock> </example>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijcomref20382.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijcomref20382.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijcomref20382.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijcomref20382.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,38 +17,37 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijcomref20382">
+<reference id="rtoolsijcomref20382" xml:lang="en-us">
<title>Disconnect</title>
<prolog><metadata>
-<keywords><indexterm>Disconnect</indexterm><indexterm>Database connection URL<indexterm>shortcut</indexterm></indexterm><indexterm>Disconnecting</indexterm>
+<keywords><indexterm>Disconnect</indexterm><indexterm>Database connection
+URL<indexterm>shortcut</indexterm></indexterm><indexterm>Disconnecting</indexterm>
</keywords>
-</metadata>
-</prolog><refbody>
-<refsyn><title>Syntax</title>
-<codeblock><b>DISCONNECT [ ALL | CURRENT | <b><i><xref href="rtoolsijcomref40155.dita#rtoolsijcomref40155">Identifier</xref> </i></b>]</b></codeblock>
-</refsyn>
-<section><title>Description</title>
-<p>Issues a <codeph>java.sql.Connection.close</codeph> request against the current
-connection. There must be a current connection at the time the request is
-made.</p>
-<p>If ALL is specified, all known connections are closed and there is no current
-connection.</p>
-<p>Disconnect CURRENT is the same as Disconnect.</p>
-<p>If a connection name is specified with an identifier, the command disconnects
-the named connection. The name must be the name of a connection in the current
-session provided with the <xref href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> property
-or with the <xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref> command.</p>
-<p>If the <xref href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref> property or the <xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref> command without the AS clause was
-used, you can supply the name the system generated for the connection. If
-the current connection is the named connection, when the command completes,
-there will be no current connection and you must issue a <xref href="rtoolsijcomref39198.dita#rtoolsijcomref39198"/> or <xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref> command.</p>
-<p>A Disconnect command issued against
-a <ph conref="toolsconrefs.dita#prod/productshortname"></ph> connection does not shut down the database or <ph conref="toolsconrefs.dita#prod/productshortname"></ph> (but
-the <xref href="rtoolsijcomref33358.dita#rtoolsijcomref33358">Exit</xref> command does).</p>
-</section>
-<example><title>Example</title>
-<codeblock>ij><b> connect 'jdbc:derby:menuDB;create=true';</b>
+</metadata></prolog>
+<refbody>
+<refsyn><title>Syntax</title> <codeblock><b>DISCONNECT [ ALL | CURRENT | <b><i>ConnectionIdentifier </i></b>]</b></codeblock> </refsyn>
+<section><title>Description</title> <p>Disconnects from the database. Specifically
+issues a <codeph>java.sql.Connection.close</codeph> request against the connection
+indicated on the command line. There must be a current connection at the time
+the request is made.</p> <p>If ALL is specified, all known connections are
+closed and there will be no current connection.</p> <p>Disconnect CURRENT
+is the same as Disconnect without indicating a connection, the default connection
+is closed.</p> <p>If a connection name is specified with an identifier, the
+command disconnects the named connection. The name must be the name of a connection
+in the current session provided with the <xref href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> property
+or with the <xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref> command.</p> <p>If
+the <xref href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref> property
+or the <xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref> command
+without the AS clause was used, you can supply the name the system generated
+for the connection. If the current connection is the named connection, when
+the command completes, there will be no current connection and you must issue
+a <xref href="rtoolsijcomref39198.dita#rtoolsijcomref39198"></xref> or <xref
+href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref> command.</p> <p>A
+Disconnect command issued against a <ph conref="toolsconrefs.dita#prod/productshortname"></ph> connection
+does not shut down the database or <ph conref="toolsconrefs.dita#prod/productshortname"></ph> (but
+the <xref href="rtoolsijcomref33358.dita#rtoolsijcomref33358">Exit</xref> command
+does).</p> </section>
+<example><title>Example</title> <codeblock>ij><b> connect 'jdbc:derby:menuDB;create=true';</b>
ij> -- we create a new table in menuDB:
<b>CREATE TABLE menu(course CHAR(10), ITEM char(20), PRICE integer);</b>
0 rows inserted/updated/deleted
@@ -61,5 +62,6 @@
ij(NEWDB)> <b>set connection sample1;</b>
ij> <b>disconnect sample1;</b>
ij> <b>disconnect all;</b>
-ij></codeblock>
-</example></refbody></reference>
+ij></codeblock> </example>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijcomref22318.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijcomref22318.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijcomref22318.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijcomref22318.dita Fri Sep 8 09:36:07 2006
@@ -24,25 +24,25 @@
</keywords>
</metadata></prolog>
<refbody>
-<refsyn><title>Syntax</title><codeblock><b>CONNECT <b><i><xref href="rtoolsijcomref34110.dita#rtoolsijcomref34110">String</xref></i></b> [ PROTOCOL <b
-><i><xref href="rtoolsijcomref40155.dita#rtoolsijcomref40155">Identifier</xref></i></b> ]
- [ AS <b><i><xref href="rtoolsijcomref40155.dita#rtoolsijcomref40155">Identifier</xref></i></b> ] [ USER <b><i><xref
-href="rtoolsijcomref34110.dita#rtoolsijcomref34110">String</xref> </i></b>
- PASSWORD <b><i><xref href="rtoolsijcomref34110.dita#rtoolsijcomref34110">String</xref></i></b> ]</b></codeblock> </refsyn>
-<section><title>Description</title><p>Takes the value of the string database
-connection URL and issues a <codeph>java.sql.DriverManager.getConnection</codeph> request
+<refsyn><title>Syntax</title><codeblock><b>CONNECT <b><i>ConnectionURLString</i></b> [ PROTOCOL <b><i>Identifier</i></b> ]
+ [ AS <b><i>Identifier</i></b> ] [ USER <b><i>String </i></b>
+ PASSWORD <b><i>String</i></b> ]</b></codeblock> </refsyn>
+<section><title>Description</title><p>Connects to the database indicated by
+the <i>ConnectionURLString</i>. Specifically, takes the value of the string
+database connection URL and issues a <codeph>java.sql.DriverManager.getConnection</codeph> request
to set the current connection to that database connection URL.</p><p>You have
the option of specifying a name for your connection. Use the <xref href="rtoolsijcomref39198.dita#rtoolsijcomref39198">Set
Connection</xref> command to switch between connections. If you do not name
a connection, the system generates a name automatically.</p><p>You also have
the option of specifying a named protocol previously created with the <xref
-href="rtoolsijcomref27997.dita#rtoolsijcomref27997">Protocol</xref> command or the <xref
-href="rtoolsijpropref12236.dita#rtoolsijpropref12236">ij.protocol.protocolName</xref> property.</p><p>If
+href="rtoolsijcomref27997.dita#rtoolsijcomref27997">Protocol</xref> command
+or the <xref href="rtoolsijpropref12236.dita#rtoolsijpropref12236">ij.protocol.protocolName</xref> property.</p><p>If
the connection requires a user name and password, supply those with the optional
user and password parameters.</p><p>If the connect succeeds, the connection
-becomes the current one and ij displays a new prompt for the <xref href="rtoolsijcomref11128.dita#rtoolsijcomref11128">Next</xref> command.
-If you have more than one open connection, the name of the connection appears
-in the prompt.</p><p>All further commands are processed against the new connection.</p> </section>
+becomes the current one and ij displays a new prompt for the next command
+to be entered. If you have more than one open connection, the name of the
+connection appears in the prompt.</p><p>All further commands are processed
+against the new, current connection.</p> </section>
<example><title>Example</title><codeblock>ij> <b>connect 'jdbc:derby:menuDB;create=true';</b>
ij> -- we create a new table in menuDB:
<b>CREATE TABLE menu(course CHAR(10), item CHAR(20), price INTEGER);</b>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijcomref25570.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijcomref25570.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijcomref25570.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijcomref25570.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,13 +17,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijcomref25570">
+<reference id="rtoolsijcomref25570" xml:lang="en-us">
<title>ij commands and errors reference</title>
<prolog><metadata>
-<keywords>
-</keywords>
-</metadata>
-</prolog>
-<refbody><section>This section describes the commands and errors eithin the ij tool.</section>
-</refbody></reference>
+<keywords></keywords>
+</metadata></prolog>
+<refbody>
+<section>This section describes the commands and errors within the ij tool.</section>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijcomref25753.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijcomref25753.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijcomref25753.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijcomref25753.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,30 +17,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijcomref25753">
+<reference id="rtoolsijcomref25753" xml:lang="en-us">
<title>Autocommit</title>
<prolog><metadata>
-<keywords><indexterm>Autocommit</indexterm><indexterm>Auto-commit<indexterm>turning off</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog><refbody>
-<refsyn><title>Syntax</title>
-<codeblock><b>AUTOCOMMIT { ON | OFF }</b></codeblock>
-</refsyn>
-<section><title>Description</title>
-<p>Turns the connection's auto-commit mode on or off. JDBC specifies that
-the default auto-commit mode is <codeph>ON</codeph>. Certain types of processing
-require that auto-commit mode be <codeph>OFF</codeph>. For information about auto-commit,
-see the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.</p>
-<p>If auto-commit mode is turned on when there is a transaction outstanding,
+<keywords><indexterm>Autocommit</indexterm><indexterm>Auto-commit<indexterm>turning
+off</indexterm></indexterm></keywords>
+</metadata></prolog>
+<refbody>
+<refsyn><title>Syntax</title> <codeblock><b>AUTOCOMMIT { ON | OFF }</b></codeblock> </refsyn>
+<section><title>Description</title> <p>Turns the connection's auto-commit
+mode on or off. JDBC specifies that the default auto-commit mode is <codeph>ON</codeph>.
+Certain types of processing require that auto-commit mode be <codeph>OFF</codeph>.
+For information about auto-commit, see the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.</p> <p>If
+auto-commit mode is changed from off to on when there is a transaction outstanding,
that work is committed when the current transaction commits, not at the time
-auto-commit is turned on. Use <xref href="rtoolsijcomref31510.dita#rtoolsijcomref31510">Commit</xref> or <xref href="rtoolsijcomref12297.dita#rtoolsijcomref12297">Rollback</xref> before turning on auto-commit when
-there is a transaction outstanding, so that all prior work is completed before
-the return to auto-commit mode.</p>
-</section>
-<example><title>Example</title>
-<codeblock>ij> <b>autocommit off;</b>
+auto-commit is turned on. Use <xref href="rtoolsijcomref31510.dita#rtoolsijcomref31510">Commit</xref> or <xref
+href="rtoolsijcomref12297.dita#rtoolsijcomref12297">Rollback</xref> before
+turning on auto-commit when there is a transaction outstanding, so that all
+prior work is completed before the return to auto-commit mode.</p> </section>
+<example><title>Example</title> <codeblock>ij> <b>autocommit off;</b>
ij> <b>DROP TABLE menu;</b>
0 rows inserted/updated/deleted
ij> <b>CREATE TABLE menu (course CHAR(10), item CHAR(20), price INT);</b>
@@ -49,5 +46,6 @@
3 rows inserted/updated/deleted
ij> <b>commit;</b>
ij> <b>autocommit on;</b>
-ij></codeblock>
-</example></refbody></reference>
+ij></codeblock> </example>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijcomref30679.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijcomref30679.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijcomref30679.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijcomref30679.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,46 +17,47 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijcomref30679">
+<reference id="rtoolsijcomref30679" xml:lang="en-us">
<title>Execute</title>
<prolog><metadata>
<keywords><indexterm>Execute</indexterm><indexterm>Prepared statements<indexterm>executing</indexterm></indexterm>
</keywords>
-</metadata>
-</prolog><refbody>
-<refsyn><title>Syntax</title>
-<codeblock><b>EXECUTE { <b><i><xref href="rtoolsijcomref34110.dita#rtoolsijcomref34110">String</xref></i></b> | <b><i><xref href="rtoolsijcomref40155.dita#rtoolsijcomref40155">Identifier</xref></i></b> }
-[ USING { <b><i><xref href="rtoolsijcomref34110.dita#rtoolsijcomref34110">String</xref></i></b> | <b><i><xref href="rtoolsijcomref40155.dita#rtoolsijcomref40155">Identifier</xref></i></b> } ]</b></codeblock>
-</refsyn>
-<section><title>Description</title>
-<p>Has several uses:
-<ul>
-<li>To execute an SQL command that has the same name as an <codeph>ij</codeph> command,
-using the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref> <i>String</i> style. The String is passed to the connection without further
-examination or processing by <codeph>ij</codeph>. <i>Normally, you
-execute SQL commands directly, not with the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref> command</i>.</li>
-<li>To execute a named command previously prepared with the <codeph>ij</codeph> <xref href="rtoolsijcomref12333.dita#rtoolsijcomref12333">Prepare</xref> command, using the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref> <i>Identifier</i> style.</li>
+</metadata></prolog>
+<refbody>
+<refsyn><title>Syntax</title> <codeblock><b>EXECUTE { <b><i>SQLString</i></b> | <b><i>PreparedStatementIdentifier</i></b> }
+[ USING { <b><i>String</i></b> | <b><i>Identifier</i></b> } ]</b></codeblock> </refsyn>
+<section><title>Description</title> <p>Has several uses: <ul>
+<li>To execute an SQL command entered as <i>SQLString</i>, using the <xref
+href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref> <i>String</i> style.
+The String is passed to the connection without further examination or processing
+by <codeph>ij</codeph>. <i>Normally, you execute SQL commands directly, not
+with the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref> command</i>.</li>
+<li>To execute a named command identified by <i>PreparedStatementIdentifier</i>.
+This must be previously prepared with the <codeph>ij</codeph> <xref href="rtoolsijcomref12333.dita#rtoolsijcomref12333">Prepare</xref> command.</li>
<li>To execute either flavor of command when that command contains dynamic
-parameters, taking values from the Using portion of the command. In this style,
-the Using portion's <i>String</i> or previously prepared <i>Identifier</i> is executed, and it must have a result set
-as its result. Each row of the result set is applied to the input parameters
-of the command to be executed, so the number of columns in the Using's
-result set must match the number of input parameters in the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref>'s statement. The results of each execution of the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref> statement are displayed as they are made. If the Using's
-result set contains no rows, the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref>'s
-statement is not executed.
-<p>When auto-commit mode is on, the Using's
-result set is closed upon the first execution of the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref> statement. To ensure multiple-row execution of the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref> command, use the <xref href="rtoolsijcomref25753.dita#rtoolsijcomref25753">Autocommit</xref> command
+parameters, specify the values in the Using portion of the command. In this
+style, the <i>SQLString</i> or previously prepared <i>PreparedStatementIdentifier</i> is
+executed using the values supplied as <i>String</i> or <i>Identifier</i>.
+The <i>Identifier</i> in the USING clause must have a result set as its result.
+Each row of the result set is applied to the input parameters of the command
+to be executed, so the number of columns in the Using's result set must match
+the number of input parameters in the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref>'s
+statement. The results of each execution of the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref> statement
+are displayed as they are made. If the Using's result set contains no rows,
+the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref>'s
+statement is not executed. <p>When auto-commit mode is on, the Using's result
+set is closed upon the first execution of the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref> statement.
+To ensure multiple-row execution of the <xref href="rtoolsijcomref30679.dita#rtoolsijcomref30679">Execute</xref> command,
+use the <xref href="rtoolsijcomref25753.dita#rtoolsijcomref25753">Autocommit</xref> command
to turn auto-commit off.</p></li>
-</ul></p>
-</section>
-<example><title>Example</title>
-<codeblock>ij><b> autocommit off;</b>
+</ul></p> </section>
+<example><title>Example</title> <codeblock>ij><b> autocommit off;</b>
ij> <b>prepare menuInsert as 'INSERT INTO menu VALUES (?, ?, ?)';</b>
ij><b> execute menuInsert using 'VALUES
(''entree'', ''lamb chop'', 14),
(''dessert'', ''creme brulee'', 6)';</b>
1 row inserted/updated/deleted
1 row inserted/updated/deleted
-ij> <b>commit;</b> </codeblock>
-</example></refbody></reference>
+ij> <b>commit;</b> </codeblock> </example>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijcomref39042.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijcomref39042.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijcomref39042.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijcomref39042.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,27 +17,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijcomref39042">
+<reference id="rtoolsijcomref39042" xml:lang="en-us">
<title>Driver</title>
<prolog><metadata>
<keywords><indexterm>Driver</indexterm><indexterm>JDBC driver<indexterm>loading </indexterm></indexterm>
</keywords>
-</metadata>
-</prolog><refbody>
-<refsyn><title>Syntax</title>
-<codeblock><b>DRIVER <b><i><xref href="rtoolsijcomref34110.dita#rtoolsijcomref34110">String</xref></i></b></b></codeblock>
-</refsyn>
-<section><title>Description</title>
-<p>Takes the value of the string and issues a <i>Class.forName </i>request to load the named class. The class is expected to be a JDBC driver
-that registers itself with <i>java.sql.DriverManager</i>.</p>
-<p>If the <xref href="rtoolsijcomref39042.dita#rtoolsijcomref39042">Driver</xref> command succeeds,
-a new <codeph>ij</codeph> prompt appears for the next command. </p>
-</section>
-<example><title>Example</title>
-<codeblock>ij> -- load the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> driver so that a connection
+</metadata></prolog>
+<refbody>
+<refsyn><title>Syntax</title> <codeblock><b>DRIVER <b><i>DriverNameString</i></b></b></codeblock> </refsyn>
+<section><title>Description</title> <p>Takes the value of the <i>DriverNameString</i> and
+issues a <i>Class.forName</i> request to load the named class. The class is
+expected to be a JDBC driver that registers itself with <i>java.sql.DriverManager</i>.</p> <p>If
+the <xref href="rtoolsijcomref39042.dita#rtoolsijcomref39042">Driver</xref> command
+succeeds, a new <codeph>ij</codeph> prompt appears for the next command. </p> </section>
+<example><title>Example</title> <codeblock>ij> -- load the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> driver so that a connection
-- can be made:
<b>driver 'org.apache.derby.jdbc.EmbeddedDriver';</b>
ij><b> connect 'jdbc:derby:menuDB;create=true';</b>
-ij></codeblock>
-</example></refbody></reference>
+ij></codeblock> </example>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijcomref88554.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijcomref88554.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijcomref88554.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijcomref88554.dita Fri Sep 8 09:36:07 2006
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
+ "../dtd/reference.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijpropref10135.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijpropref10135.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijpropref10135.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijpropref10135.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,39 +17,35 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijpropref10135">
-<title>ij.connection.connectionName</title>
+<reference id="rtoolsijpropref10135" xml:lang="en-us">
+<title>ij.connection.<i>connectionName</i></title>
<prolog><metadata>
-<keywords><indexterm>ij.connection</indexterm>
-</keywords>
-</metadata>
-</prolog><refbody>
-<section><title>Function</title>
-<p>Creates a named connection to the given database connection URL when <codeph>ij</codeph> starts
-up; it is equivalent to the Connect AS <i>Identifier</i> command.
-The database connection URL can be of the short form if an <i><xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref></i> is specified. This property can be specified more than once
-per session, creating multiple connections. When <codeph>ij</codeph> starts, it
-displays the names of all the connections created in this way. It also displays
-the name of the current connection, if there is more than one, in the <codeph>ij</codeph> prompt.</p>
-</section>
-<refsyn><title>Syntax</title>
-<codeblock><b>ij.connection.<b><i>connectionName</i></b>=<b><i>databaseConnectionURL</i></b></b></codeblock>
-<p>The <i>databaseConnectionURL</i> is not a string; do not
-enclose it in quotation marks.</p>
-</refsyn>
-<example><title>Example</title>
-<codeblock>D:> <b>java -Dij.connection.sample1=jdbc:derby:sample
+<keywords><indexterm>ij.connection</indexterm></keywords>
+</metadata></prolog>
+<refbody>
+<section><title>Function</title> <p>Creates a named connection to the given
+database connection URL when <codeph>ij</codeph> starts up; it is equivalent
+to the Connect AS <i>Identifier</i> command. The database connection URL can
+be of the short form if an <i><xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref></i> is
+specified. This property can be specified more than once per session, creating
+multiple connections. When <codeph>ij</codeph> starts, it displays the names
+of all the connections created in this way. It also displays the name of the
+current connection, if there is more than one, in the <codeph>ij</codeph> prompt.</p> </section>
+<refsyn><title>Syntax</title> <codeblock><b>ij.connection.<b><i>connectionName</i></b>=<b><i>databaseConnectionURL</i></b></b></codeblock> <p>When
+specified on the command line the <i>databaseConnectionURL</i> should not
+be enclosed in single quotations, however, if the database path contains special
+characters (e.g. a space) it must be enclosed in double quotes.</p> </refsyn>
+<example><title>Example</title>This example connects to the existing database <i>sample</i> and
+creates then connects to the database <i>anohterDB</i>.<codeblock>D:> <b>java -Dij.connection.sample1=jdbc:derby:sample
-Dij.connection.anotherConn=jdbc:derby:anotherDB;create=true
org.apache.derby.tools.ij</b>
ij version <ph conref="toolsconrefs.dita#vers/shortversionnumber"></ph>
ANOTHERCONN* - jdbc:derby:anotherDB;create=true
SAMPLE1 - jdbc:derby:sample
* = current connection
-ij(ANOTHERCONN)></codeblock>
-</example>
-<section><title>See also</title>
-<ul>
-<li><xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318"/></li>
-</ul>
-</section></refbody></reference>
+ij(ANOTHERCONN)></codeblock> </example>
+<section><title>See also</title> <ul>
+<li><xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318"></xref></li>
+</ul> </section>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijpropref28146.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijpropref28146.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijpropref28146.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijpropref28146.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,31 +17,27 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijpropref28146">
+<reference id="rtoolsijpropref28146" xml:lang="en-us">
<title>ij.database</title>
<prolog><metadata>
-<keywords><indexterm>ij.database</indexterm>
-</keywords>
-</metadata>
-</prolog><refbody>
-<section><title>Function</title>
-<p>Creates a connection with a generated name to the given database connection URL when <codeph>ij</codeph> starts up, thus creating an initial connection (with a generated
-name) for the <codeph>ij</codeph> session. (If you have specified an <i>ij.protocol</i>, you can use a shortened form of the URL.) After it boots, <codeph>ij</codeph> displays the generated name of the connection made with this property.</p>
-</section>
-<refsyn><title>Syntax</title>
-<codeblock><b>ij.database=<b><i>databaseConnectionURL</i></b></b></codeblock>
-<p>The <i>databaseConnectionURL</i> is not a string; do not
-enclose it in quotation marks.</p>
-</refsyn>
-<example><title>Example</title>
-<codeblock><b>java -Dij.protocol=jdbc:derby: -Dij.connection.sample1=sample
- -Dij.connection.anotherConn=anotherDB
+<keywords><indexterm>ij.database</indexterm></keywords>
+</metadata></prolog>
+<refbody>
+<section><title>Function</title> <p>Creates a connection to the database name
+listed indicated by the property when <codeph>ij</codeph> starts up. You can
+specify the complete connection URL (including protocol) with this property
+or just the database name if you also specify <i>ij.protocol</i> on the command
+line. After it boots, <codeph>ij</codeph> displays the generated name of the
+connection made with this property.</p> </section>
+<refsyn><title>Syntax</title> <codeblock><b>ij.database=<b><i>databaseConnectionURL</i></b></b></codeblock> <p>When
+specified on the command line the <i>databaseConnectionURL</i> should not
+be enclosed in single quotations, however, if the database path contains special
+characters (e.g. a space) it must be enclosed in double quotes.</p> </refsyn>
+<example><title>Example</title> <codeblock><b>java -Dij.protocol=jdbc:derby:
-Dij.database=wombat;create=true org.apache.derby.tools.ij</b>
ij version <ph conref="toolsconrefs.dita#vers/shortversionnumber"></ph>
-CONNECTION2* - jdbc:derby:wombat;create=true
-ANOTHERCONN - jdbc:derby:anotherDB
-SAMPLE1 - jdbc:derby:sample
+CONNECTION0* - jdbc:derby:wombat
* = current connection
-ij(CONNECTION2)></codeblock>
-</example></refbody></reference>
+ij></codeblock> </example>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijpropref35032.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijpropref35032.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijpropref35032.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijpropref35032.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,35 +17,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijpropref35032">
+<reference id="rtoolsijpropref35032" xml:lang="en-us">
<title>ij.protocol</title>
<prolog><metadata>
-<keywords><indexterm>ij.protocol</indexterm>
-</keywords>
-</metadata>
-</prolog><refbody>
-<section><title>Function</title>
-<p>Specifies the protocol and subprotocol portions of the database connection URL for connections.
-Automatically loads the appropriate driver for recognized subprotocol. The
-recognized protocol is:
-<ul>
+<keywords><indexterm>ij.protocol</indexterm></keywords>
+</metadata></prolog>
+<refbody>
+<section><title>Function</title> <p>Specifies the default protocol and subprotocol
+portions of the database connection URL for connections. The Derby protocol
+is: <ul>
<li>jdbc:derby:</li>
-</ul></p>
-<p>Allows you to use a short form of a database name.</p>
-</section>
-<refsyn><title>Syntax</title>
-<codeblock><b>ij.protocol=<b><i>protocolForEnvironment</i></b></b></codeblock>
-</refsyn>
-<example><title>Example</title>
-<codeblock>D:><b>java -Dij.protocol=jdbc:derby:
+</ul></p> <p>Allows you to use a short form of a database name in a connection
+URL.</p> </section>
+<refsyn><title>Syntax</title> <codeblock><b>ij.protocol=<b><i>protocolForEnvironment</i></b></b></codeblock> </refsyn>
+<example><title>Example</title> <codeblock>D:><b>java -Dij.protocol=jdbc:derby:
org.apache.derby.tools.ij</b>
ij version <ph conref="toolsconrefs.dita#vers/shortversionnumber"></ph>
ij> <b>Connect 'newDB;create=true';</b>
-ij></codeblock>
-</example>
-<section><title>See also</title>
-<ul>
-<li><xref href="rtoolsijcomref27997.dita#rtoolsijcomref27997"/></li>
-</ul>
-</section></refbody></reference>
+ij></codeblock> </example>
+<section><title>See also</title> <ul>
+<li><xref href="rtoolsijcomref27997.dita#rtoolsijcomref27997"></xref></li>
+</ul> </section>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijpropref41073.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijpropref41073.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijpropref41073.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijpropref41073.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,31 +17,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijpropref41073">
+<reference id="rtoolsijpropref41073" xml:lang="en-us">
<title>ij.driver</title>
<prolog><metadata>
-<keywords><indexterm>ij.driver</indexterm>
-</keywords>
-</metadata>
-</prolog><refbody>
-<section><title>Function</title>
-<p>Loads the JDBC driver that the class specifies.</p>
-</section>
-<refsyn><title>Syntax</title>
-<codeblock><b>ij.driver=<b><i>JDBCDriverClassName</i></b></b></codeblock>
-</refsyn>
-<section><title>Notes</title>
-<p>The driver property is a synonym.</p>
-</section>
-<example><title>Example</title>
-<codeblock>D:><b>java -Dij.driver=sun.jdbc.odbc.JdbcOdbcDriver org.apache.derby.tools.ij</b>
+<keywords><indexterm>ij.driver</indexterm></keywords>
+</metadata></prolog>
+<refbody>
+<section><title>Function</title> <p>Loads the JDBC driver that the class specifies.</p> </section>
+<refsyn><title>Syntax</title> <codeblock><b>ij.driver=<b><i>JDBCDriverClassName</i></b></b></codeblock> </refsyn>
+<section><title>Notes</title> </section>
+<example><title>Example</title> <codeblock>D:><b>java -Dij.driver=sun.jdbc.odbc.JdbcOdbcDriver org.apache.derby.tools.ij</b>
ij version <ph conref="toolsconrefs.dita#vers/shortversionnumber"></ph>
ij> <b>Connect 'jdbc:odbc:MyODBCDataSource';</b>
-ij></codeblock>
-</example>
-<section><title>See also</title>
-<ul>
-<li><xref href="rtoolsijcomref39042.dita#rtoolsijcomref39042"/></li>
-</ul>
-</section></refbody></reference>
+ij></codeblock> </example>
+<section><title>See also</title> <ul>
+<li><xref href="rtoolsijcomref39042.dita#rtoolsijcomref39042"></xref></li>
+</ul> </section>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita Fri Sep 8 09:36:07 2006
@@ -28,18 +28,22 @@
a datasource, <ph conref="toolsconrefs.dita#prod/productshortname"></ph> does
not use the DriverManager mechanism to establish connections.</p> </section>
<refsyn><title>Syntax</title>To establish a connection using <codeph>ij.dataSource</codeph>,
-you need to set the <codeph>ij.dataSource.databaseName</codeph> and <codeph>ij.dataSource.createDatabase</codeph> properties
+you need to set the <codeph>ij.dataSource.databaseName</codeph> and to create
+the database specify the <codeph>ij.dataSource.createDatabase</codeph> property
as well.<codeblock><b>ij.dataSource=<i>dataSourcename</i></b> <b>ij.dataSource.databaseName=<i>databasename</i></b> <b>[ij.dataSource.createDatabase=create]</b
></codeblock></refsyn>
-<example><title>Example</title>
-<codeblock><b>
+<example><title>Example</title> <codeblock><b>
<i>#
# If your application runs on JDK 1.6 or higher, then you should
# specify the JDBC4 variant of this DataSource:
# org.apache.derby.jdbc.EmbeddedDataSource40.
#</i>
java -Dij.dataSource=org.apache.derby.jdbc.EmbeddedDataSource
--Dij.dataSource.databaseName=sample -Dij.dataSource.createDatabase=create</b></codeblock> </example>
+-Dij.dataSource.databaseName=sample -Dij.dataSource.createDatabase=create
+ org.apache.derby.tools.ij</b>
+ij version 10.2
+CONNECTION0*
+* = current connection</codeblock> </example>
<section>For more information about DataSources, refer to the JDBC documentation
and "Using <ph conref="toolsconrefs.dita#prod/productshortname"></ph> as a
J2EE Resource Manager" in the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite>.</section>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijproprefpassword.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijproprefpassword.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijproprefpassword.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijproprefpassword.dita Fri Sep 8 09:36:07 2006
@@ -24,9 +24,8 @@
</metadata></prolog>
<refbody>
<section><title>Function</title><p>Specifies the password used to make connections.
-When you specify the <codeph>ij.password</codeph> property, and use <codeph>ij</codeph> to
-create the database, you will always need to use the password in order to
-access the database unless you set up additional users.</p> </section>
+This property is used in conjunction with the <i>ij.user</i> property to authenticate
+a connection. If authentication is not active then these properties are ignored.</p> </section>
<refsyn><title>Syntax</title><codeblock><b>ij.password=<b><i>password</i></b></b></codeblock></refsyn>
<example><title>Example</title><codeblock><b>java -Dij.user=me -Dij.password=mine org.apache.derby.tools.ij</b></codeblock> </example>
<section>See the <cite><ph conref="toolsconrefs.dita#pub/citdevelop"></ph></cite> for
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijproprefuser.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijproprefuser.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijproprefuser.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijproprefuser.dita Fri Sep 8 09:36:07 2006
@@ -23,15 +23,18 @@
<keywords><indexterm>ij.user</indexterm></keywords>
</metadata></prolog>
<refbody>
-<section><title>Function</title><p>Specifies the user with which connections
-are made by default. When you connect using <codeph>ij.user</codeph>, <codeph>ij</codeph> assumes
-that the database schema to be used is the same as the user id provided. However,
-certain database objects cannot be created until a schema exists (such as
-after a CREATE SCHEMA statement has been issued, followed by a SET SCHEMA
-statement, or by fully qualifying the database objects to be created). If
-no user is specified, no SET SCHEMA statement has been issued, or CREATE statements
-do not qualify the schema, all database objects are assumed to be under the
-APP schema.</p> </section>
+<section><title>Function</title><p>Specifies the logon name used to establish
+the connection. This property is used in conjunction with the <i>ij.password</i> property
+to authenticate a connection. If authentication is not active then these properties
+are ignored.</p><p>When a username is supplied you need to be aware of the
+database schema. When you connect using <codeph>ij.user</codeph>, the default
+database schema applied to all SQL statements is the same as the user id provided
+even if the schema does not exist. Use the SET SCHEMA statement to change
+the default when the schema does not match the username. Alternately you can
+fully qualify the database objects referred to in the SQL statements . If
+no user is specified, no SET SCHEMA statement has been issued, or SQL statements
+do not include the schema name, all database objects are assumed to be under
+the APP schema.</p> </section>
<refsyn><title>Syntax</title><codeblock><b>ij.user=<b><i>username</i></b></b></codeblock></refsyn>
<example><title>Example</title><codeblock><b>java -Dij.user=me -Dij.password=mine org.apache.derby.tools.ij</b>
ij version <ph conref="toolsconrefs.dita#vers/shortversionnumber"></ph>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijtools16879.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijtools16879.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijtools16879.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijtools16879.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!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
@@ -15,25 +17,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rtoolsijtools16879">
+<reference id="rtoolsijtools16879" xml:lang="en-us">
<title>JDBC drivers overview</title>
<prolog><metadata>
-<keywords>
-</keywords>
-</metadata>
-</prolog>
+<keywords></keywords>
+</metadata></prolog>
<refbody>
-<section><p>Before a JDBC application interacts with a database, it must cause the
-JDBC driver to be loaded in the Java session. <ph conref="toolsconrefs.dita#prod/productshortname"></ph> provides the following
-JDBC drivers for use with the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database engine:
-<ul>
-<li><i>org.apache.derby.jdbc.EmbeddedDriver</i>
-<p>For embedded
-environments, when <ph conref="toolsconrefs.dita#prod/productshortname"></ph> runs in the same JVM as the application</p></li>
-<li><i>org.apache.derby.jdbc.ClientDriver</i>
-<p>For using the Network Client to connect to the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> Network Server</p></li>
+<section><p>Before a JDBC application connects to a database, it must cause
+the proper JDBC driver to be loaded in the Java session. <ph conref="toolsconrefs.dita#prod/productshortname"></ph> provides
+the following JDBC drivers for use with the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database
+engine: <ul>
+<li><i>org.apache.derby.jdbc.EmbeddedDriver</i> <p>For embedded environments,
+when <ph conref="toolsconrefs.dita#prod/productshortname"></ph> runs in the
+same JVM as the application. This is commonly referred to as the embedded
+drvier.</p></li>
+<li><i>org.apache.derby.jdbc.ClientDriver</i> <p>For client/server environments
+that use the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> Network
+Server. This is commonly referred to as the Network Client driver.</p></li>
</ul></p></section>
-<section><p>You can use <codeph>ij</codeph> to connect to any database that supplies a JDBC
-driver. For those databases, you would need to load the supplied JDBC driver.</p></section>
-</refbody></reference>
+<section><p>You can use <codeph>ij</codeph> to connect to any database that
+supplies a JDBC driver. For those databases, you would need to load the supplied
+JDBC driver.</p></section>
+</refbody>
+</reference>
Modified: db/derby/docs/branches/10.2/src/tools/rtoolsimport64241.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsimport64241.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsimport64241.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsimport64241.dita Fri Sep 8 09:36:07 2006
@@ -50,7 +50,7 @@
a character delimiter. The specified character is used in place of double
quotation marks to enclose a character string. You can pass a NULL value to
use the default value of a double quotation mark.</p></li>
-<li><i id="rtoolsimportcodeset">codeset</i> <p>Specifies the code set of
+<li><i id="rtoolsimportcodesetarg">codeset</i> <p>Specifies the code set of
the data in the input file. The code set name should be one of the Java-supported
character encoding sets. Data is converted from the specified code set to
the database code set (<codeph>UTF-8</codeph>). You can pass a NULL value
Modified: db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita Fri Sep 8 09:36:07 2006
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
+ "../dtd/ditabase.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,9 +17,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
- "../dtd/ditabase.dtd">
-
<dita>
<concept id="prod" xml:lang="en-us">
<title>Product specific entities</title>
@@ -29,7 +28,7 @@
<p><ph id="productshortname">Derby</ph></p>
<p><ph id="productlongname">Apache Derby</ph></p>
<p><ph id="productinstallname">Derby_10</ph></p>
-<p><ph id="productinstallpath">DERBY_INSTALL</ph></p>
+<p><ph id="productinstallpath">DERBY_HOME</ph></p>
<p><ph id="productlowercase">derby</ph></p>
</conbody>
</concept>
@@ -54,7 +53,7 @@
<p><ph id="citutilities"><i>Derby Tools and Utilities Guide</i></ph></p>
<p><ph id="citgetstart"><i>Getting Started with Derby</i></ph></p>
<p><ph id="cittuning"><i>Tuning Derby</i></ph></p>
+<p><ph id="citwwd"><i>Working With Derby</i></ph></p>
</conbody>
</concept>
</dita>
-