svn commit: r425411 - in /db/derby/docs/trunk/src/tools: rtoolsijproprefdatasource.dita ttoolsij98878.dita

[rh...@apache.org]

Author: rhillegas
Date: Tue Jul 25 08:07:12 2006
New Revision: 425411

URL: http://svn.apache.org/viewvc?rev=425411&view=rev
Log:
DERBY-1271: Committed derlby-1271_toolsGuide_v01.diff, the JDBC4-related changes to the Tools Guide.

Modified:
    db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita
    db/derby/docs/trunk/src/tools/ttoolsij98878.dita

Modified: db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita?rev=425411&r1=425410&r2=425411&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita Tue Jul 25 08:07:12 2006
@@ -30,7 +30,14 @@
 you need to set the <codeph>ij.dataSource.databaseName</codeph> and <codeph>ij.dataSource.createDatabase</codeph> properties
 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>java -Dij.dataSource=org.apache.derby.jdbc.EmbeddedDataSource
+<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>
 <section>For more information about DataSources, refer to the JDBC documentation
 and "Using <ph conref="toolsconrefs.dita#prod/productshortname"></ph> as a

Modified: db/derby/docs/trunk/src/tools/ttoolsij98878.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/ttoolsij98878.dita?rev=425411&r1=425410&r2=425411&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/ttoolsij98878.dita (original)
+++ db/derby/docs/trunk/src/tools/ttoolsij98878.dita Tue Jul 25 08:07:12 2006
@@ -22,12 +22,10 @@
 <context> <p>You can run scripts in ij in any of the following ways:</p> </context>
 <steps-unordered>
 <step><cmd>Name an input file as a command-line argument. </cmd><stepxmp>For
-example:<codeblock>java -Djdbc.drivers=org.apache.derby.jdbc.EmbeddedDriver
-    org.apache.derby.tools.ij &lt;<i>myscript.sql</i>></codeblock></stepxmp>
+example:<codeblock>java org.apache.derby.tools.ij &lt;<i>myscript.sql</i>></codeblock></stepxmp>
 </step>
 <step><cmd>Redirect standard input to come from a file. </cmd><stepxmp>For
-example:<codeblock>java -Djdbc.drivers=org.apache.derby.jdbc.EmbeddedDriver
-    org.apache.derby.tools.ij &lt; &lt;<i>myscript.sql</i>></codeblock></stepxmp>
+example:<codeblock>java org.apache.derby.tools.ij &lt; &lt;<i>myscript.sql</i>></codeblock></stepxmp>
 </step>
 <step><cmd>Use the <xref href="rtoolsijcomref28886.dita#rtoolsijcomref28886">Run</xref> command
 from the ij command line. </cmd><stepxmp>For example:<codeblock>ij&gt; run '<i>myscript.sql</i>';</codeblock></stepxmp>
@@ -38,8 +36,7 @@
 ij echoes input from a file. If you redirect standard input to come from a
 file, ij does not echo commands.</note></result>
 <example><p>You can save output in any of the following ways: </p><ul>
-<li>By redirecting output to a file:<codeblock>java -Djdbc.drivers=org.apache.derby.jdbc.EmbeddedDriver
-    org.apache.derby.tools.ij &lt;<i>myscript.sql</i>&gt; &gt; &lt;<i>myoutput.txt</i>>
+<li>By redirecting output to a file:<codeblock>java org.apache.derby.tools.ij &lt;<i>myscript.sql</i>&gt; &gt; &lt;<i>myoutput.txt</i>>
 </codeblock></li>
 <li>By setting the <codeph>ij.outfile</codeph> property:<codeblock>java -Dij.outfile=&lt;<i>myoutput.txt</i>> org.apache.derby.tools.ij 
     &lt;myscript.sql></codeblock></li>