db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r441555 [3/3] - in /db/derby/docs/branches/10.2: ./ lib/ src/adminguide/ src/devguide/ src/pt_BR/ref/ src/ref/ src/tools/ src/workingwithderby/
Date Fri, 08 Sep 2006 16:36:16 GMT
Modified: db/derby/docs/branches/10.2/src/tools/ttoolsij11815.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ttoolsij11815.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ttoolsij11815.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ttoolsij11815.dita Fri Sep  8 09:36:07 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/branches/10.2/src/tools/ttoolsij30600.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ttoolsij30600.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ttoolsij30600.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ttoolsij30600.dita Fri Sep  8 09:36:07 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/branches/10.2/src/tools/ttoolsij97656.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ttoolsij97656.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ttoolsij97656.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ttoolsij97656.dita Fri Sep  8 09:36:07 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/branches/10.2/src/tools/ttoolsij98878.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ttoolsij98878.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ttoolsij98878.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ttoolsij98878.dita Fri Sep  8 09:36:07 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/branches/10.2/src/tools/ttoolsjarload1002986.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ttoolsjarload1002986.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ttoolsjarload1002986.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ttoolsjarload1002986.dita Fri Sep  8 09:36:07 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/branches/10.2/src/tools/ttoolsjarload1003059.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ttoolsjarload1003059.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ttoolsjarload1003059.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ttoolsjarload1003059.dita Fri Sep  8 09:36:07 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/branches/10.2/src/tools/ttoolsjarload1003120.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/ttoolsjarload1003120.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/ttoolsjarload1003120.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/ttoolsjarload1003120.dita Fri Sep  8 09:36:07 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>
-

Modified: db/derby/docs/branches/10.2/src/workingwithderby/cwwdsummary.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/workingwithderby/cwwdsummary.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/workingwithderby/cwwdsummary.dita (original)
+++ db/derby/docs/branches/10.2/src/workingwithderby/cwwdsummary.dita Fri Sep  8 09:36:07
2006
@@ -21,8 +21,8 @@
 <concept id="cwwdsummary" rev="1.0" xml:lang="en-us">
 <title>What next with Derby</title>
 <shortdesc>Congratulations on completing the activities in this workbook.
-You now have experience with using Derby in both the embedded and client /
-server architectures. With this basic knowledge you are ready to begin using
+You now have experience with using Derby in both the embedded and Client-Server 
+architectures. With this basic knowledge you are ready to begin using
 Derby to address your own specific needs. We recommend visiting the Apache
 Derby website as your next step in learning about this lightweight and powerful
 tool.</shortdesc>
@@ -39,7 +39,7 @@
 a few moments to become familiar with the many online resources available
 to Derby users and developers by browsing the Derby website at Apache. Whether
 you are performing a general evaluation of Derby or have a specific need to
-address the above link is a good stepping stone to finding additional information
+address, the above link is a good stepping stone to finding additional information
 of interest. The <xref format="html" href="http://db.apache.org/derby/quick_start.html"
 scope="local">Derby Quick Start page</xref> is a good reference page organized
 by area of interest. You will find many content rich areas such as the <cite>Derby

Modified: db/derby/docs/branches/10.2/src/workingwithderby/rwwdactivity3.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/workingwithderby/rwwdactivity3.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/workingwithderby/rwwdactivity3.dita (original)
+++ db/derby/docs/branches/10.2/src/workingwithderby/rwwdactivity3.dita Fri Sep  8 09:36:07
2006
@@ -20,7 +20,7 @@
 -->
 <reference id="rwwdactivity3" rev="1.1" xml:lang="en-us">
 <title>The WwdEmbedded program</title>
-<shortdesc>This section describes the <codeph>WwdEmbedded</codeph> program,
+<shortdesc>This section describes the <codeph>WwdEmbedded.java</codeph>
program,
 highlighting details specific to accessing a Derby database from a JDBC program.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>WwdEmbedded.java<indexterm>code description</indexterm><indexterm>org.apache.derby.jdbc.EmbeddedDriver</indexterm></indexterm>
@@ -28,8 +28,8 @@
 <indexterm>SQLException</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section>The <codeph>WwdEmbedded.java</codeph> program is described here.
-Most of the code related to the database activities performed is included
+<section>
+Most of the code related to the database activities performed is included in this document
 but you may find it helpful to open the program file and follow along in a
 text viewer or editor. The <cite>SECTION NAMES</cite> referred to in this
 text can be found in the comments within the program code and serve as cross-reference
@@ -37,7 +37,7 @@
 from the <codeph>WwdUtils</codeph> class. The utility class code is not described
 here but is available for review in the file <codeph>WwdUtils.java</codeph></section>
 <section><title>Initialize the program</title> <cite>INITIALIZATION
SECTION</cite>:
-The initial lines of code identify the Java libraries used in the program
+The initial lines of code identify the Java libraries used in the program,  
 then set up the Java class <codeph>WwdEmbedded</codeph> and the <codeph>main</codeph>
method
 signature. Refer to a standard Java programming guide for information on these
 program constructs.<codeblock frame="topbot">import java.sql.*;
@@ -93,7 +93,7 @@
 Program objects needed to perform subsequent SQL operations are initialized
 here and a check is made to see if the required data table exists.<p>The statement
 object <codeph>s</codeph> is initialized. If the utility method <codeph>WwdUtils.wwdChk4Table</codeph>
does
-not find the <varname>WISH_LIST</varname> table it is create by executing
+not find the <varname>WISH_LIST</varname> table it is created by executing
 the SQL stored in the variable <varname>createString</varname> via this statement
 object. </p><codeblock frame="topbot">s = conn.createStatement();
 if (! WwdUtils.wwdChk4Table(conn))
@@ -110,13 +110,13 @@
 </codeblock></section>
 <section><title>Interact with the Database</title><cite>ADD / DISPLAY
RECORD
 SECTION</cite>: This section uses the utility method <codeph>WwdUtils.getWishItem</codeph>
to
-gather information from the User. It then utilizes the objects setup previously
+gather information from the User. It then utilizes the objects set up previously
 to insert the data into the <varname>WISH_LIST</varname> table and then display
 all records. A standard <codeph>do</codeph> loop causes the program to repeat
 this series of steps until <userinput>exit</userinput> is entered.  The data
 related activities performed in this section are:<p>The <codeph>setString</codeph>
method
 sets the substitution parameter of the <codeph>psInsert</codeph> object to
-the value entered by the User then <codeph>executeUpdate</codeph> is called
+the value entered by the User. Then <codeph>executeUpdate</codeph> is called
 to perform the database insert.<codeblock frame="topbot">psInsert.setString(1,answer);
 psInsert.executeUpdate();  
 </codeblock></p><p>The statement object <codeph>s</codeph>
is used to select
@@ -137,7 +137,7 @@
 When an application starts the Derby engine it should shutdown all databases
 prior to exiting. The attribute <codeph>;shutdown=true</codeph> in the Derby
 connection URL performs the shutdown. The shutdown process cleans up records
-in the transaction log to insure a faster startup the next time the database
+in the transaction log to ensure a faster startup the next time the database
 is booted. <p>This section verifies that the embedded driver is being used
 then issues the shutdown command and catches the shutdown exception to confirm
 the database shutdown cleanly. The shutdown status is displayed before the

Modified: db/derby/docs/branches/10.2/src/workingwithderby/twwdIntro.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/workingwithderby/twwdIntro.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/workingwithderby/twwdIntro.dita (original)
+++ db/derby/docs/branches/10.2/src/workingwithderby/twwdIntro.dita Fri Sep  8 09:36:07 2006
@@ -40,7 +40,7 @@
 It is written and implemented completely in Java, and provides users with a
 small footprint standards-based database engine that can be tightly embedded
 into any Java based solution. Derby insures data integrity and provides sophisticated
-transactional support. In it's default configuration there is no separate
+transaction support. In its default configuration there is no separate
 database server to be installed or maintained by the end user. For more information
 on Derby visit the Derby website at: <xref format="html" href="http://db.apache.org/derby"
 scope="local">http://db.apache.org/derby</xref>.</p><p>Performing the
Working
@@ -72,9 +72,10 @@
 <dt>On UNIX Korn Shell platforms:</dt>
 <dd><codeblock frame="topbot"><b>&quot;$JAVA_HOME/bin/java&quot;
-version</b></codeblock></dd>
 </dlentry></dl></stepxmp><stepresult>The output from the command
will look
-something like this:<codeblock frame="topbot"><i>java version &quot;1.4.2_04&quot;
 Java(TM) 2 Runtime Environment,
-Standard Edition (build 1.4.2_04-b05)  Java HotSpot(TM)
-Client VM (build 1.4.2_04-b05, mixed mode)</i></codeblock>The output you see
+something like this:<codeblock frame="topbot"><i>java version &quot;1.4.2_04&quot;
 
+Java(TM) 2 Runtime Environment, Standard Edition (build 1.4.2_04-b05)  
+Java HotSpot(TM) Client VM (build 1.4.2_04-b05, mixed mode)</i></codeblock>
+The output you see
 may be different from what is shown here, because the <userinput>java -version</userinput>
command
 outputs vendor-specific information. If the command produced an error or the
 version listed is not 1.3 or higher, please install a Java development kit

Modified: db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity1.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity1.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity1.dita (original)
+++ db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity1.dita Fri Sep  8 09:36:07
2006
@@ -22,14 +22,14 @@
 <title>Creating the database and running SQL</title>
 <prolog><metadata>
 <keywords><indexterm>Connection URL<indexterm>embedded driver</indexterm><indexterm>create=true</indexterm></indexterm>
-<indexterm>IJ</indexterm><indexterm>Database<indexterm>creating</indexterm><indexterm>connecting
+<indexterm>ij</indexterm><indexterm>Database<indexterm>creating</indexterm><indexterm>connecting
 to</indexterm></indexterm><indexterm>Derby<indexterm>logfile, message
and
 error</indexterm></indexterm><indexterm>SQL<indexterm>create table</indexterm><indexterm>insert</indexterm><indexterm>select</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
 <steps>
-<step><cmd>Run the Derby IJ tool.</cmd><stepxmp><dl><dlentry>
+<step><cmd>Run the Derby ij tool.</cmd><stepxmp><dl><dlentry>
 <dt>On Windows platforms:</dt>
 <dd><codeblock frame="topbot"><b>java -jar %DERBY_HOME%\lib\derbyrun.jar
ij</b>
 
@@ -101,7 +101,7 @@
 </codeblock></stepxmp></substep>
 </substeps>
 </step>
-<step><cmd>Exit the IJ tool.</cmd><stepxmp><codeblock frame="topbot"><b>exit;</b>
+<step><cmd>Exit the ij tool.</cmd><stepxmp><codeblock frame="topbot"><b>exit;</b>
 </codeblock></stepxmp></step>
 <step><cmd>Browse the key files created by the activity.</cmd><stepxmp><ul>
 <li>The <b><filepath><varname>derby.log</varname></filepath></b>
message and
@@ -124,8 +124,9 @@
 </ul></stepxmp></step>
 </steps>
 <postreq><dl><dlentry>
-<dt>Description of connection command: <codeph>connect 'jdbc:derby:firstdb;create=true';</codeph></dt>
-<dd><codeph>connect</codeph> - the IJ command to establish a connection
to
+<dt>Description of connection command:
+<codeph>connect 'jdbc:derby:firstdb;create=true';</codeph></dt>
+<dd><codeph>connect</codeph> - the ij command to establish a connection
to
 a database</dd>
 <dd>The Derby connection URL enclosed in single quotes:<ul>
 <li><codeph>jdbc:derby:</codeph> - JDBC protocol specification for the
Derby
@@ -136,7 +137,7 @@
 <li><codeph>;create=true</codeph> - The Derby <varname>URL attribute</varname>
used
 to create databases. Derby does not have an SQL <varname>create database</varname>
command.</li>
 </ul></dd>
-<dd><codeph><b>;</b></codeph>  (semicolon) - the IJ command
terminator.</dd>
+<dd><codeph><b>;</b></codeph>  (semicolon) - the ij command
terminator.</dd>
 </dlentry></dl></postreq>
 </taskbody>
 </task>

Modified: db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity2.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity2.dita?view=diff&rev=441555&r1=441554&r2=441555
==============================================================================
--- db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity2.dita (original)
+++ db/derby/docs/branches/10.2/src/workingwithderby/twwdactivity2.dita Fri Sep  8 09:36:07
2006
@@ -19,13 +19,13 @@
 limitations under the License.
 -->
 <task id="twwdactivity2" rev="1.1" xml:lang="en-us">
-<title>Activity 2: Run SQL using the Client Driver</title>
+<title>Activity 2: Run SQL using the Client driver</title>
 <shortdesc>This activity uses Derby within a Client-Server configuration by
 using the Network Server. The <codeph>ij</codeph> tool is the client application
 that connects to the Derby Network Server. A database called <codeph>seconddb</codeph>
is
 created and some basic SQL commands are executed.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Network Server</indexterm><indexterm>Client
Driver</indexterm>
+<keywords><indexterm>Network Server</indexterm><indexterm>Client
driver</indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>



Mime
View raw message