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 jt...@apache.org on 2006/09/03 21:36:15 UTC

svn commit: r439838 [2/2] - /db/derby/docs/trunk/src/tools/

Modified: db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita?view=diff&rev=439838&r1=439837&r2=439838
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita Sun Sep  3 12:36:13 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/trunk/src/tools/rtoolsijproprefpassword.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijproprefpassword.dita?view=diff&rev=439838&r1=439837&r2=439838
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijproprefpassword.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijproprefpassword.dita Sun Sep  3 12:36:13 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/trunk/src/tools/rtoolsijproprefuser.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijproprefuser.dita?view=diff&rev=439838&r1=439837&r2=439838
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijproprefuser.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijproprefuser.dita Sun Sep  3 12:36:13 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/trunk/src/tools/rtoolsijtools16879.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijtools16879.dita?view=diff&rev=439838&r1=439837&r2=439838
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijtools16879.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijtools16879.dita Sun Sep  3 12:36:13 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/trunk/src/tools/toolsconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/toolsconrefs.dita?view=diff&rev=439838&r1=439837&r2=439838
==============================================================================
--- db/derby/docs/trunk/src/tools/toolsconrefs.dita (original)
+++ db/derby/docs/trunk/src/tools/toolsconrefs.dita Sun Sep  3 12:36:13 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>
-

Modified: db/derby/docs/trunk/src/tools/ttoolsij11815.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/ttoolsij11815.dita?view=diff&rev=439838&r1=439837&r2=439838
==============================================================================
--- db/derby/docs/trunk/src/tools/ttoolsij11815.dita (original)
+++ db/derby/docs/trunk/src/tools/ttoolsij11815.dita Sun Sep  3 12:36:13 2006
@@ -21,24 +21,25 @@
 <title>Starting ij</title>
 <taskbody>
 <context> <p><ph conref="toolsconrefs.dita#prod/productshortname"></ph> provides
-batch and shell scripts for users in Windows and UNIX environments. If you
-put the appropriate script in your path, you will be able to start ij with
-a simple command. These scripts use the <xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref> property,
-which automatically loads a driver and simplifies the process of connecting
-to a database. The scripts are found in the %<ph conref="toolsconrefs.dita#prod/productinstallpath"></ph>%/bin/
-directory. You can also customize the ij scripts to suit your environment.</p><p>If
-you are starting ij from a command line, be sure that the derbytools.jar file
-is in your classpath. If you are using <ph conref="toolsconrefs.dita#prod/productshortname"></ph> as
-a database server, start the server before connecting to the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database.
-You can start ij by running the ij scripts in the /frameworks/embedded/bin/
-directory or in the /frameworks/NetworkServer/bin/ directory.</p> </context>
-<example>To start ij, run the script provided or use this command:   <codeblock><xref
-href="#ttoolsij11815/rtoolsij42358">java</xref> [&lt;<i><xref href="ttoolsij11815.dita#ttoolsij11815/rtoolsij26546">options</xref></i>>] org.apache.derby.tools.ij [-p &lt;<i
-><xref href="ttoolsij11815.dita#ttoolsij11815/rtoolsij40855">propertyFile</xref></i>>] [&lt;<i><xref
-href="#ttoolsij11815/rtoolsij39639">inputFile</xref></i>>]</codeblock>The
-command line items are:    <ul>
-<li id="rtoolsij42358">java   <p>The JVM you want to run (java is the name
-of the JVM program). </p></li>
+batch and shell scripts for users in Windows and UNIX environments that can
+be used to start IJ. By calling the appropriate script you will start ij and
+be able to connect with a simple command. These scripts set the <xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref> property,
+which simplifies the process of connecting to a database by eliminating the
+need to specify the protocol portion of the connection URL. The scripts are
+found in the %<ph conref="toolsconrefs.dita#prod/productinstallpath"></ph>%/frameworks/
+directory tree. You can also customize the ij scripts to suit your environment.</p><p>If
+you are starting ij from a command line, be sure that derbyrun.jar is in your
+classpath (for pre-10.2 distributions derbytools.jar and usually derby.jar
+were required in the classpath). If you are using <ph conref="toolsconrefs.dita#prod/productshortname"></ph> as
+a client/server environment, start the server before connecting to the <ph
+conref="toolsconrefs.dita#prod/productshortname"></ph> database. You can start
+ij by running the ij scripts for your environment in the %<ph conref="toolsconrefs.dita#prod/productinstallpath"></ph>%/frameworks/embedded/bin/
+directory or in the %<ph conref="toolsconrefs.dita#prod/productinstallpath"></ph>%/frameworks/NetworkServer/bin/
+directory.</p> </context>
+<example>To start ij, run the script provided or use this command:   <codeblock>java [&lt;<i>options</i>>] org.apache.derby.tools.ij 
+    [-p &lt;<i>propertyFile</i>>] [&lt;<i>inputFile</i>>]</codeblock>The command
+line items are:    <ul>
+<li id="rtoolsij42358">java   <p>Start the JVM. </p></li>
 <li id="rtoolsij26546">options   <p>The options that the JVM uses. You can
 use the -D command to set ij properties (see <xref href="ttoolsij30600.dita#ttoolsij30600"></xref>)
 or system properties, such as <ph conref="toolsconrefs.dita#prod/productshortname"></ph> properties. </p></li>

Modified: db/derby/docs/trunk/src/tools/ttoolsij30600.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/ttoolsij30600.dita?view=diff&rev=439838&r1=439837&r2=439838
==============================================================================
--- db/derby/docs/trunk/src/tools/ttoolsij30600.dita (original)
+++ db/derby/docs/trunk/src/tools/ttoolsij30600.dita Sun Sep  3 12:36:13 2006
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "../dtd/task.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 task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "../dtd/task.dtd">
 <task id="ttoolsij30600" xml:lang="en-us">
 <title>Starting ij using properties</title>
 <taskbody>
@@ -34,8 +33,8 @@
 start ij with an <xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref> of <b>jdbc:derby:</b> and
 an <xref href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref> of <b>sample</b>,
 use the following command:   <codeblock>java -Dij.protocol=jdbc:derby: -Dij.database=sample
-    org.apache.derby.tools.ij</codeblock></p><p>To start ij with
-two named connections, using the <xref href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> property,
+    org.apache.derby.tools.ij</codeblock></p><p>To start ij with two named
+connections, using the <xref href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> property,
 use the following command:   <codeblock>java -Dij.connection.sample=jdbc:derby:sample 
 -Dij.connection.History=jdbc:derby:History 
 -Dderby.system.home=c:\derby\demo\databases
@@ -48,9 +47,5 @@
 SAMPLE -     jdbc:derby:sample
 * = current connection
 ij(HISTORY)&gt;</codeblock></p></example>
-<postreq>To start ij to connect to the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> Network
-Server, you must specify the <codeph>user</codeph> and <codeph>password</codeph> attributes
-on the URL. For more information, see the <cite><ph conref="toolsconrefs.dita#pub/citadmin"></ph></cite>.</postreq>
 </taskbody>
 </task>
-

Modified: db/derby/docs/trunk/src/tools/ttoolsij97656.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/ttoolsij97656.dita?view=diff&rev=439838&r1=439837&r2=439838
==============================================================================
--- db/derby/docs/trunk/src/tools/ttoolsij97656.dita (original)
+++ db/derby/docs/trunk/src/tools/ttoolsij97656.dita Sun Sep  3 12:36:13 2006
@@ -23,63 +23,90 @@
 <context> <p>To connect to a <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database,
 you need to perform the following steps: </p> </context>
 <steps>
+<step><cmd>Start the JVM</cmd></step>
 <step><cmd>Load the appropriate driver.</cmd></step>
-<step><cmd>Provide a database connection URL for the database.</cmd></step>
+<step><cmd>Create a connection by providing a valid database connection URL.</cmd>
+</step>
 </steps>
-<example>In ij, there are three ways of accomplishing these steps:  <ul>
-<li>Full database connection URL   <p>ij can work with any JDBC driver. For
-drivers supplied by other vendors, you need to load the driver separately.
-For drivers supplied by <ph conref="toolsconrefs.dita#prod/productshortname"></ph>,
-you can load the driver by specifying the full database connection URL in
-the connection. You do not need to load the driver explicitly in a second
-step.</p><p>To connect, specify the full database connection URL in a <xref
-href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref> command, <xref
-href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> property, or <xref
-href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref> property.</p><p>The
-protocol of the database connection URL must correspond to the driver provided
-by <ph conref="toolsconrefs.dita#prod/productshortname"></ph> (see <xref href="ctoolsijtools16011.dita#ctoolsijtools16011"></xref>)
-or, if you are using another driver, to that driver.   The following example
-shows how to connect to a <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database
-by using the <b>Connect</b> command: <codeblock>D:&gt;java org.apache.derby.tools.ij
+<example><p>When using ij interactively to connect to a  <ph conref="toolsconrefs.dita#prod/productshortname"></ph> database
+connection information is generally supplied on the full database connection
+URL. ij automatically loads the appropriate driver based on the syntax of
+the URL. The following example shows how to connect in this manner by using
+the <b>Connect</b> command and the embedded driver: <codeblock>D:&gt;java org.apache.derby.tools.ij
 ij version <ph conref="toolsconrefs.dita#vers/shortversionnumber"></ph>
 ij&gt; connect 'jdbc:derby:sample';
-ij&gt;</codeblock></p></li>
-<li>Protocol and short database connection URL   <p>For drivers supplied by <ph
-conref="toolsconrefs.dita#prod/productshortname"></ph>, specifying a protocol
-automatically loads the appropriate driver. You do not need to load the driver
-explicitly in a separate step. You specify a protocol with a property (<xref
-href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref> or <xref href="rtoolsijpropref12236.dita#rtoolsijpropref12236">ij.protocol.protocolName</xref>) 
-or command (<xref href="rtoolsijcomref27997.dita#rtoolsijcomref27997">Protocol</xref>).</p><p>To
-connect, specify the "short form" of the database connection URL in a <xref
-href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref> command, <xref
-href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> property, or <xref
-href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref> property. A
-short form of the database connection URL eliminates the protocol (For more
-information, see <xref href="ctoolsijtools16011.dita#ctoolsijtools16011/ctoolsabtproto"></xref>).</p><codeblock>D:&gt;java org.apache.derby.tools.ij
+ij&gt;</codeblock>If the URL entered contains Network Client information the <b>Connect</b> command
+loads the Network Client driver:<codeblock>D:&gt;java org.apache.derby.tools.ij
 ij version <ph conref="toolsconrefs.dita#vers/shortversionnumber"></ph>
-ij&gt; protocol 'jdbc:derby:';
-ij&gt; connect 'sample';
-ij&gt;
-
-D:&gt;java -Dij.protocol.myprotocolName=jdbc:derby:
-    org.apache.derby.tools.ij
+ij&gt; connect 'jdbc:derby://localhost:1527/sample';
+ij&gt;</codeblock><note>In these and subsequent examples the databases were
+created in the <term>derby.system.home</term> directory. For more information
+on the System Directory see the <ph conref="toolsconrefs.dita#pub/citdevelop"></ph>.</note></p><p>ij
+provides alternate methods of specifying part or all of a connection URL (e.g.
+the <xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref>, <xref
+href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref>,
+or <xref href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> properties).
+These properties are often used when a script is being used and the path to
+the database or the driver name is not known until runtime. The properties
+can also to used to shorten the amount of information that must be provided
+with the connection URL. The following are some examples of different ways
+to supply the connection information: </p><ul>
+<li>Supplying full connection information on the command line<p>Specifying
+one of the following properties along with a valid connection URL on the ij
+command line starts ij with the connection already active. This is often used
+when running a SQL script so the database name or path can be specified at
+runtime.<ul>
+<li> <xref href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref> -
+opens a connection using the URL provided</li>
+<li><xref href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.<i>connectionName</i></xref> -
+Used to open one or more connections. The property can appear multiple times
+on the command line with different <i>connectionName</i>s and the same or
+different URLs.</li>
+</ul>This example shows how to create the database <i>myTours</i> and run
+the script <i>ToursDB_schema.sql</i> by specifying the database URL using
+the <xref href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref> property.<codeblock>C:\><b>java -Dij.database=jdbc:derby:myTours;create=true 
+     org.apache.derby.tools.ij 
+    %DERBY_HOME%\demo\programs\toursdb\ToursDB_schema.sql</b>
+ij version <ph conref="toolsconrefs.dita#vers/shortversionnumber"></ph>
+CONNECTION0* -  jdbc:derby:myTours
+* = current connection
+ij> -- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+     <b><i>...output removed...</i></b>
+ij> CREATE TRIGGER TRIG2 AFTER DELETE ON FLIGHTS FOR EACH STATEMENT MODE DB2SQL
+INSERT INTO FLIGHTS_HISTORY (STATUS) VALUES ('INSERTED FROM TRIG2');
+0 rows inserted/updated/deleted
+ij></codeblock></p></li>
+<li>Defining a Protocol and using a "short form"  URL   <p>A default URL protocol
+and subprotocol can be specified by setting the property <xref href="rtoolsijpropref35032.dita#rtoolsijpropref35032">ij.protocol</xref> or
+using the ij <xref href="rtoolsijcomref27997.dita#rtoolsijcomref27997">Protocol</xref> command.
+This allows a connection to be made by specifying only the database name.
+This "short form" of the database connection URL defaults the protocol (For
+more information, see <xref href="ctoolsijtools16011.dita#ctoolsijtools16011/ctoolsabtproto"></xref>).</p><p>This
+example uses the ij <xref href="rtoolsijcomref27997.dita#rtoolsijcomref27997">Protocol</xref> command
+and a "short form" connection URL:</p><codeblock>D:&gt;<b>java org.apache.derby.tools.ij</b>
 ij version <ph conref="toolsconrefs.dita#vers/shortversionnumber"></ph>
-ij&gt; connect 'sample' protocol myprotocolName;
-ij&gt;</codeblock></li>
-<li>Driver and full database connection URL   <p>If you are using the drivers
-supplied by <ph conref="toolsconrefs.dita#prod/productshortname"></ph>, use
+ij&gt;<b> protocol 'jdbc:derby:';</b>
+ij&gt; <b>connect 'sample';</b>
+ij&gt;
+</codeblock></li>
+<li>Specifying an alternate Driver  <p>If you are using the drivers supplied
+by <ph conref="toolsconrefs.dita#prod/productshortname"></ph>, you can specify
 the driver names listed in <xref href="rtoolsijtools16879.dita#rtoolsijtools16879"></xref>.
-The <ph conref="toolsconrefs.dita#prod/productshortname"></ph> drivers are
-implicitly loaded when a supported protocol is used. Any other driver has
-to be explicitly loaded. You can load a driver explicitly with an ij property
-(<xref href="rtoolsijpropref41073.dita#rtoolsijpropref41073">ij.Driver</xref>), a system
-property (<codeph>jdbc.drivers</codeph>), or a command (<xref href="rtoolsijcomref39042.dita#rtoolsijcomref39042">Driver</xref>).</p> <p>To
-connect, specify the full database connection URL in a <xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318">Connect</xref> command, <xref
-href="rtoolsijpropref10135.dita#rtoolsijpropref10135">ij.connection.connectionName</xref> property, or <xref
-href="rtoolsijpropref28146.dita#rtoolsijpropref28146">ij.database</xref> property.</p><codeblock>D:&gt;java org.apache.derby.tools.ij
+However, the <ph conref="toolsconrefs.dita#prod/productshortname"></ph> drivers
+are implicitly loaded when a supported protocol is used so specifying them
+is probably redundant. Specifying a driver is required when ij is used with
+other JDBC drivers to connect to non-<ph conref="toolsconrefs.dita#prod/productshortname"></ph> databases.
+To use drivers supplied by other vendors explicitly specify the driver one
+of three ways</p><ul>
+<li>with an ij property <xref href="rtoolsijpropref41073.dita#rtoolsijpropref41073">ij.Driver</xref></li>
+<li>using the JVM system property <codeph>jdbc.drivers</codeph></li>
+<li>using the ij <xref href="rtoolsijcomref39042.dita#rtoolsijcomref39042">Driver</xref> command</li>
+</ul>This example specifies the driver using the ij <xref href="rtoolsijcomref39042.dita#rtoolsijcomref39042">Driver</xref> command<codeblock>D:&gt;<b
+>java org.apache.derby.tools.ij</b>
 ij version <ph conref="toolsconrefs.dita#vers/shortversionnumber"></ph>
-ij&gt; driver 'sun.jdbc.odbc.JdbcOdbcDriver';
-ij&gt; connect 'jdbc:odbc:myOdbcDataSource';
+ij&gt; <b>driver 'sun.jdbc.odbc.JdbcOdbcDriver';</b>
+ij&gt; <b>connect 'jdbc:odbc:myOdbcDataSource';</b>
 ij&gt;</codeblock></li>
 </ul></example>
 </taskbody>

Modified: db/derby/docs/trunk/src/tools/ttoolsij98878.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/ttoolsij98878.dita?view=diff&rev=439838&r1=439837&r2=439838
==============================================================================
--- db/derby/docs/trunk/src/tools/ttoolsij98878.dita (original)
+++ db/derby/docs/trunk/src/tools/ttoolsij98878.dita Sun Sep  3 12:36:13 2006
@@ -43,8 +43,8 @@
     &lt;myscript.sql></codeblock></li>
 </ul> </example>
 <postreq><p>ij exits when you enter the <xref href="rtoolsijcomref33358.dita#rtoolsijcomref33358">Exit</xref> command
-or, if you give a command file on the Java invocation line, when the end of
-the command file is reached. When you use the <xref href="rtoolsijcomref33358.dita#rtoolsijcomref33358">Exit</xref> command,
+or, if executing a script, when the end of the command file is reached. When
+you use the <xref href="rtoolsijcomref33358.dita#rtoolsijcomref33358">Exit</xref> command,
 ij automatically shuts down an embedded <ph conref="toolsconrefs.dita#prod/productshortname"></ph> system
 by issuing a <codeph>connect jdbc:derby:;shutdown=true</codeph> request. It
 does not shut down <ph conref="toolsconrefs.dita#prod/productshortname"></ph> if

Modified: db/derby/docs/trunk/src/tools/ttoolsjarload1002986.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/ttoolsjarload1002986.dita?view=diff&rev=439838&r1=439837&r2=439838
==============================================================================
--- db/derby/docs/trunk/src/tools/ttoolsjarload1002986.dita (original)
+++ db/derby/docs/trunk/src/tools/ttoolsjarload1002986.dita Sun Sep  3 12:36:13 2006
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "../dtd/task.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,14 +17,19 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "../dtd/task.dtd">
 <task id="ttoolsjarload1002986" xml:lang="en-us">
 <title>Adding a Jar File</title>
 <taskbody>
-<context> <p>To add a jar file using SQL syntax:   <codeblock>CALL SQL.install_jar('<xref
-href="ttoolsjarload1003120.dita#ttoolsjarload1003120/rtoolsjarload41400">jarFilePath</xref>', qualifiedJarName, 0)</codeblock></p></context>
+<context> <p>To add a jar file using SQL syntax:   <codeblock>CALL SQLJ.install_jar('jarFilePath', qualifiedJarName, 0)</codeblock></p></context>
+<steps-unordered>
+<step><cmd></cmd></step>
+<step><cmd>jarFilePath  </cmd><stepxmp><p>The path and physical name of the
+jar file to add or use as a replacement. For example:</p><p>d:/todays_build/tours.jar</p></stepxmp>
+</step>
+<step><cmd>qualifiedJarName   </cmd><stepxmp><p>The <ph conref="toolsconrefs.dita#prod/productshortname"></ph> name
+of the jar file, qualified by the schema name. Two examples:   <codeblock>MYSCHEMA.Sample1</codeblock></p></stepxmp>
+<stepxmp><codeblock> -- a delimited identifier.
+MYSCHEMA."Sample2"</codeblock></stepxmp></step>
+</steps-unordered>
 </taskbody>
 </task>
-

Modified: db/derby/docs/trunk/src/tools/ttoolsjarload1003059.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/ttoolsjarload1003059.dita?view=diff&rev=439838&r1=439837&r2=439838
==============================================================================
--- db/derby/docs/trunk/src/tools/ttoolsjarload1003059.dita (original)
+++ db/derby/docs/trunk/src/tools/ttoolsjarload1003059.dita Sun Sep  3 12:36:13 2006
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "../dtd/task.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,14 +17,9 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "../dtd/task.dtd">
 <task id="ttoolsjarload1003059" xml:lang="en-us">
 <title>Removing a jar file</title>
 <taskbody>
-<context> <p>To remove a jar file using SQL syntax:   <codeblock>CALL SQLJ.remove_jar ('<xref
-href="ttoolsjarload1003120.dita#ttoolsjarload1003120/rtoolsjarload41400">jarFilePath</xref>', qualifiedJarName, 0)</codeblock></p></context>
+<context> <p>To remove a jar file using SQL syntax:   <codeblock>CALL SQLJ.remove_jar (qualifiedJarName, 0)</codeblock></p></context>
 </taskbody>
 </task>
-

Modified: db/derby/docs/trunk/src/tools/ttoolsjarload1003120.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/ttoolsjarload1003120.dita?view=diff&rev=439838&r1=439837&r2=439838
==============================================================================
--- db/derby/docs/trunk/src/tools/ttoolsjarload1003120.dita (original)
+++ db/derby/docs/trunk/src/tools/ttoolsjarload1003120.dita Sun Sep  3 12:36:13 2006
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "../dtd/task.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -15,15 +17,10 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "../dtd/task.dtd">
-
 <task id="ttoolsjarload1003120" xml:lang="en-us">
 <title>Replacing a jar file</title>
 <taskbody>
-<context> <p>To replace a jar file using SQL syntax:   <codeblock>CALL SQLJ.replace_jar('<xref
-href="#ttoolsjarload1003120/rtoolsjarload41400">jarFilePath</xref>', qualifiedJarName, 0)</codeblock></p> </context>
+<context> <p>To replace a jar file using SQL syntax:   <codeblock>CALL SQLJ.replace_jar('jarFilePath', qualifiedJarName)</codeblock></p> </context>
 <steps-unordered>
 <step id="rtoolsjarload41400"><cmd>jarFilePath  </cmd><stepxmp><p>The path
 and physical name of the jar file to add or use as a replacement. For example:</p><p>d:/todays_build/tours.jar</p></stepxmp>
@@ -36,4 +33,3 @@
 </steps-unordered>
 </taskbody>
 </task>
-