db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1567160 - in /db/derby/docs/trunk/src: devguide/ getstart/ tools/
Date Tue, 11 Feb 2014 14:46:36 GMT
Author: chaase3
Date: Tue Feb 11 14:46:36 2014
New Revision: 1567160

URL: http://svn.apache.org/r1567160
Log:
DERBY-6236  Remove references to old JVMs (pre-Java 6) from the user guides

Modified 7 Developer's Guide topics, 3 Tools Guide topics, and 1 Getting Started topic.

Patch: DERBY-6236-dgt.diff

Modified:
    db/derby/docs/trunk/src/devguide/cdevconcepts24927.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita
    db/derby/docs/trunk/src/devguide/cdevresman89722.dita
    db/derby/docs/trunk/src/devguide/cdevresman92946.dita
    db/derby/docs/trunk/src/devguide/rdevresman79556.dita
    db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
    db/derby/docs/trunk/src/devguide/tdevdvlp36289.dita
    db/derby/docs/trunk/src/getstart/rwwdactivity3.dita
    db/derby/docs/trunk/src/tools/ctools1003034.dita
    db/derby/docs/trunk/src/tools/ctoolsusingsigcheck.dita
    db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts24927.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevconcepts24927.dita?rev=1567160&r1=1567159&r2=1567160&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts24927.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts24927.dita Tue Feb 11 14:46:36 2014
@@ -19,18 +19,15 @@ See the License for the specific languag
 limitations under the License.
 -->
 <concept id="cdevconcepts24927" xml:lang="en-us">
-<title>Working with Derby SQLExceptions in an application</title>
-<shortdesc>JDBC generates exceptions of the type
-<i>java.sql.SQLException</i>.
-If your application runs on JDK 1.6 or higher, the exceptions
-will be the refined subtypes of <i>java.sql.SQLException</i>
-introduced by JDBC4.
-To see the exceptions generated by <ph conref="../conrefs.dita#prod/productshortname"></ph>,
-retrieve and process the <codeph><i>SQLExceptions</i></codeph> in
a catch
-block.</shortdesc>
+<title>Working with <ph conref="../conrefs.dita#prod/productshortname"></ph>
+SQLExceptions in an application</title>
+<shortdesc>JDBC generates exceptions that are refined subtypes of the type
+<i>java.sql.SQLException</i>.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>SQLExceptions<indexterm>working with</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
-<conbody></conbody>
+<conbody><p>To see the exceptions generated by
+<ph conref="../conrefs.dita#prod/productshortname"></ph>, retrieve and process
+the <i>SQLExceptions</i> in a catch block.</p></conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita?rev=1567160&r1=1567159&r2=1567160&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita Tue Feb 11 14:46:36 2014
@@ -22,31 +22,29 @@ limitations under the License.
 <title>Derby JDBC driver</title>
 <shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> consists
 of both the database engine and an embedded JDBC driver. Applications use
-JDBC to interact with a database. Applications running on JDK 5
-must load the driver in order to work with the database.</shortdesc>
+JDBC to interact with a database.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>JDBC driver<indexterm>description</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>In an embedded environment, loading the driver also starts <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
+<p>In an embedded environment, the JDBC embedded driver is loaded automatically
+when you obtain a connection to the database by calling the
+<i>DriverManager.getConnection</i> method, as described in
+<xref href="cdevdvlp17453.dita#cdevdvlp17453"></xref>. Loading the driver also
+starts <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
 <p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> driver
-class name for the embedded environment is <i>org.apache.derby.jdbc.EmbeddedDriver</i>.</p>
-<p>In a Java application, you typically load the driver with the static <i>Class.forName</i>
method
-or with the <i>jdbc.drivers</i> system property. For example:</p>
-<codeblock>
-Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
-</codeblock>
-<codeblock>java -Djdbc.drivers=org.apache.derby.jdbc.EmbeddedDriver<i> applicationClass</i>
-</codeblock>
-<p>For detailed information about loading the <ph conref="../conrefs.dita#prod/productshortname"></ph>
JDBC
-driver, see "java.sql.Driver interface" in the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>.</p>
-<p>If your application runs on JDK 6 or higher, you do not need to
-explicitly load the <codeph>EmbeddedDriver</codeph>. In that environment, the
-driver loads automatically.</p>
-<p>If your application shuts down Derby or calls the
+class name for the embedded environment is
+<i>org.apache.derby.jdbc.EmbeddedDriver</i>.</p>
+<p>For detailed information about loading the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> JDBC driver, see
+"java.sql.Driver interface" in the
+<ph conref="../conrefs.dita#pub/citref"></ph>.</p>
+<p>If your application shuts down
+<ph conref="../conrefs.dita#prod/productshortname"></ph> or calls the
 <i>DriverManager.deregisterDriver</i>
 method, and you then want to reload the driver, call the
-<i>Class.forName().newInstance()</i> method.</p>
+<i>Class.forName().newInstance()</i> method. See
+<xref href="tdevdvlp20349.dita#tdevdvlp20349"></xref> for more information.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevresman89722.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevresman89722.dita?rev=1567160&r1=1567159&r2=1567160&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevresman89722.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevresman89722.dita Tue Feb 11 14:46:36 2014
@@ -30,15 +30,6 @@ examples.</shortdesc>
 </metadata></prolog>
 <conbody>
 <codeblock>
-<b>// If your application is running on the Java SE 6 platform,
-// and if you would like to call DataSource methods specific 
-// to the JDBC 4 API (for example, isWrapperFor), use the
-// JDBC 4 variants of these classes:
-//
-//   org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40
-//   org.apache.derby.jdbc.EmbeddedDataSource40
-//   org.apache.derby.jdbc.EmbeddedXADataSource40
-//</b>
 import org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource;
 import org.apache.derby.jdbc.EmbeddedDataSource;
 import org.apache.derby.jdbc.EmbeddedXADataSource; 

Modified: db/derby/docs/trunk/src/devguide/cdevresman92946.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevresman92946.dita?rev=1567160&r1=1567159&r2=1567160&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevresman92946.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevresman92946.dita Tue Feb 11 14:46:36 2014
@@ -27,22 +27,16 @@ implementations of interfaces, as shown 
 <conbody>
 <codeblock>javax.sql.XADataSource xads = makeXADataSource(mydb, true);
 
-
-<b>// example of setting property directory using </b>
-// <b><ph conref="../conrefs.dita#prod/productshortname"></ph> 's </b>XADataSource
object
+<b>// example of setting property directory using 
+// <ph conref="../conrefs.dita#prod/productshortname"></ph>'s XADataSource object</b>
 import org.apache.derby.jdbc.EmbeddedXADataSource;
 import javax.sql.XADataSource;
 <b>// dbname is the database name
 // if create is true, create the database if not already created</b>
 XADataSource makeXADataSource (String dbname, boolean create) 
 {
-    <b>//
-    // If your application runs on JDK 1.6 or higher, then
-    // you will use the JDBC4 variant of this class:
-    // EmbeddedXADataSource40.
-    //</b>
     EmbeddedXADataSource xads = new EmbeddedXADataSource();
-<b>    // use <ph conref="../conrefs.dita#prod/productshortname"></ph>
's setDatabaseName call</b>
+<b>    // use <ph conref="../conrefs.dita#prod/productshortname"></ph>'s
setDatabaseName call</b>
     xads.setDatabaseName(dbname);
     if (create)
         xads.setCreateDatabase("create");

Modified: db/derby/docs/trunk/src/devguide/rdevresman79556.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevresman79556.dita?rev=1567160&r1=1567159&r2=1567160&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevresman79556.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevresman79556.dita Tue Feb 11 14:46:36 2014
@@ -21,53 +21,38 @@ limitations under the License.
 <reference id="rdevresman79556" xml:lang="en-us">
 <title>Classes that pertain to resource managers</title>
 <shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> provides
-three embedded variants of each <i>DataSource</i> interface defined by the JDBC
+two embedded variants of each <i>DataSource</i> interface defined by the JDBC
 API.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>EmbeddedDataSource</indexterm>
-<indexterm>EmbeddedDataSource40</indexterm>
 <indexterm>BasicEmbeddedDataSource40</indexterm>
 <indexterm>EmbeddedConnectionPoolDataSource</indexterm>
-<indexterm>EmbeddedConnectionPoolDataSource40</indexterm>
 <indexterm>BasicEmbeddedConnectionPoolDataSource40</indexterm>
 <indexterm>EmbeddedXADataSource</indexterm>
-<indexterm>EmbeddedXADataSource40</indexterm>
 <indexterm>BasicEmbeddedXADataSource40</indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
 <section>
-<p>
-Applications that run on the Java SE 5 platform <b>must</b> use the first 
-variant. Applications that run on the Java SE 6 platform or higher (except
-Java SE 8 Compact Profiles) can use either of the first two variants. However,
-the <i>DataSource</i> methods specific to JDBC 4.1 and 4.2 are available only
-from the second and third variants (the ones whose class name ends with "40").</p>
-<p>Applications that run on Java SE 8 Compact Profile 2 or 3 <b>must</b>
use the
-third variant (the ones whose class name begins with "Basic"). Compact profiles
-do not support the Java Naming and Directory Interface (JNDI) API.</p>
-<p>
-If an application is running on the Java SE 6 platform or higher, all connection
-objects returned from the <i>DataSource</i> will be JDBC 4 connection objects,
-regardless of which <i>DataSource</i> variant is in use.</p>
-<p>
-The <ph conref="../conrefs.dita#prod/productshortname"></ph> implementation
+<p>Most applications must use the first variant.</p>
+<p>However, applications that run on Java SE 8 Compact Profile 2 or 3
+must use the second variant (the ones whose class name begins with "Basic").
+Compact profiles do not support the Java Naming and Directory Interface (JNDI)
+API.</p>
+<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> implementation
 classes for the <i>DataSource</i> interfaces are as follows:</p>
 <ul>
-<li><i>org.apache.derby.jdbc.EmbeddedDataSource</i>, 
-<i>org.apache.derby.jdbc.EmbeddedDataSource40</i>,
+<li><i>org.apache.derby.jdbc.EmbeddedDataSource</i>
 and <i>org.apache.derby.jdbc.BasicEmbeddedDataSource40</i> 
 <p>These classes implement the <i>javax.sql.DataSource</i> interface, which
a 
-JNDI server can reference (except in the case of the third variant). Typically,
+JNDI server can reference (except in the case of the second variant). Typically,
 this is the object that you work with as a <i>DataSource</i>.</p></li>
-<li><i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</i>,
-<i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40</i>,
+<li><i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</i>
 and <i>org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40</i>
 <p>These classes implement the <i>javax.sql.ConnectionPoolDataSource</i>
 interface and provide a factory for <i>PooledConnection</i> objects.</p></li>
-<li><i>org.apache.derby.jdbc.EmbeddedXADataSource</i>,
-<i>org.apache.derby.jdbc.EmbeddedXADataSource40</i>,
+<li><i>org.apache.derby.jdbc.EmbeddedXADataSource</i>
 and <i>org.apache.derby.jdbc.BasicEmbeddedXADataSource40</i>
 <p>These classes implement the <i>javax.sql.XADataSource</i> interface.</p></li>
 </ul>

Modified: db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita?rev=1567160&r1=1567159&r2=1567160&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita Tue Feb 11 14:46:36 2014
@@ -50,10 +50,11 @@ an application using an embedded <ph con
 shuts down <ph conref="../conrefs.dita#prod/productshortname"></ph> just before
 shutting itself down. However, an application can shut down <ph conref="../conrefs.dita#prod/productshortname"></ph>
and
 later restart it in the same JVM session. To restart <ph conref="../conrefs.dita#prod/productshortname"></ph>
successfully,
-the application needs to reload <i>org.apache.derby.jdbc.EmbeddedDriver</i> as
-follows:</p>
-<codeblock>Class.forName(org.apache.derby.jdbc.EmbeddedDriver).newInstance();</codeblock>
-<p>Loading the embedded driver starts
+the application needs to reload <i>org.apache.derby.jdbc.EmbeddedDriver</i>
+explicitly, as follows:</p>
+<codeblock>Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();</codeblock>
+<p>This is an exception to the rule that you do not need to load the driver
+explicitly when starting
 <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
 <p>The JDBC specification does not recommend calling
 <codeph>newInstance()</codeph>, but adding a <codeph>newInstance()</codeph>
call

Modified: db/derby/docs/trunk/src/devguide/tdevdvlp36289.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevdvlp36289.dita?rev=1567160&r1=1567159&r2=1567160&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevdvlp36289.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevdvlp36289.dita Tue Feb 11 14:46:36 2014
@@ -30,9 +30,7 @@ to database connection URL<indexterm>spe
 </metadata></prolog>
 <taskbody>
 <context> <p>For example, to set the user name and password:</p>
-<codeblock>Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
-
-Properties p = new Properties();
+<codeblock>Properties p = new Properties();
 
 p.setProperty("user", "sa");
 p.setProperty("password", "manager");
@@ -40,15 +38,6 @@ p.setProperty("create", "true");
 
 Connection conn = DriverManager.getConnection(
     "jdbc:derby:mynewDB", p);</codeblock>
-<p>If you are running on JDK 6 or higher, you do not normally need to invoke
-<codeph>Class.forName()</codeph>. In that environment, the
-<codeph>EmbeddedDriver</codeph> loads automatically. The only exception to this
-rule is when you need to shut down
-<ph conref="../conrefs.dita#prod/productshortname"></ph> in the middle of your
-application and then restart it. To restart
-<ph conref="../conrefs.dita#prod/productshortname"></ph>, create a new instance
-of the driver as follows:</p>
-<codeblock>Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();</codeblock>
 <p><note>If you specify any attributes both on the connection URL and in a
 <i>Properties</i> object, the attributes on the connection URL override the
 attributes in the <i>Properties</i> object.</note></p>

Modified: db/derby/docs/trunk/src/getstart/rwwdactivity3.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/rwwdactivity3.dita?rev=1567160&r1=1567159&r2=1567160&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rwwdactivity3.dita (original)
+++ db/derby/docs/trunk/src/getstart/rwwdactivity3.dita Tue Feb 11 14:46:36 2014
@@ -73,22 +73,11 @@ String createString = "CREATE TABLE WISH
   +  "(WISH_ID INT NOT NULL GENERATED ALWAYS AS IDENTITY " 
   ...
   +  " WISH_ITEM VARCHAR(32) NOT NULL) " ;</codeblock></section>
-<section><title>Start the  <ph conref="../conrefs.dita#prod/productshortname"></ph>
engine</title><p><cite>LOAD
-DRIVER SECTION</cite>: Loading the <ph conref="../conrefs.dita#prod/productshortname"></ph>
embedded
-JDBC driver starts the <ph conref="../conrefs.dita#prod/productshortname"></ph>
database
-engine. The <codeph>try</codeph> and <codeph>catch</codeph> block
(the Java
-error-handling construct) catches the exceptions that may occur. A problem
-here is usually due to an incorrect classpath setting.</p>  <codeblock>String
driver = "org.apache.derby.jdbc.EmbeddedDriver";
-...
-try {
-    Class.forName(driver); 
-} catch(java.lang.ClassNotFoundException e) {
-  ...
-}</codeblock></section>
 <section><title>Boot the database</title><p><cite>BOOT DATABASE
SECTION</cite>:
-The <codeph>DriverManager</codeph> class  loads the database using the <ph
-conref="../conrefs.dita#prod/productshortname"></ph> connection URL stored
- in the variable <codeph>connectionURL</codeph>. This URL includes the parameter
<codeph>;create=true</codeph> so
+The <codeph>DriverManager</codeph> class loads the embedded driver and connects
+to the database using the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> connection URL stored
+in the variable <codeph>connectionURL</codeph>. This URL includes the parameter
<codeph>;create=true</codeph> so
 that the database will be created if it does not already exist. The primary <codeph>try</codeph>
and <codeph>catch</codeph> block
 begins here. This construct handles errors for the database access code.</p> <codeblock>String
connectionURL = "jdbc:derby:" + dbName + ";create=true";
 ...

Modified: db/derby/docs/trunk/src/tools/ctools1003034.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/ctools1003034.dita?rev=1567160&r1=1567159&r2=1567160&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/ctools1003034.dita (original)
+++ db/derby/docs/trunk/src/tools/ctools1003034.dita Tue Feb 11 14:46:36 2014
@@ -24,8 +24,6 @@ limitations under the License.
 </metadata></prolog>
 <conbody>
 <p>All <ph conref="../conrefs.dita#prod/productshortname"></ph> tools require
-Java Platform, Standard Edition (Java SE) @MINIMUM_JDK@ or later or a platform
-that is running the Connected Device Configuration/Foundation Profile
-(JSR 169).</p>
+Java Platform, Standard Edition (Java SE) @MINIMUM_JDK@ or later.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/tools/ctoolsusingsigcheck.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/ctoolsusingsigcheck.dita?rev=1567160&r1=1567159&r2=1567160&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/ctoolsusingsigcheck.dita (original)
+++ db/derby/docs/trunk/src/tools/ctoolsusingsigcheck.dita Tue Feb 11 14:46:36 2014
@@ -40,12 +40,6 @@ example:</p>
 <codeblock>
 java -jar derbyrun.jar SignatureChecker "jdbc:derby:myDB"
 </codeblock>
-<p>On a Java ME platform, run the <codeph>SignatureChecker</codeph> tool
as
-follows, where <i>database-name</i> is the database name you would set by
-calling <i>EmbeddedSimpleDataSource.setDatabaseName()</i>:</p>
-<codeblock>
-java org.apache.derby.tools.SignatureChecker <i>database-name</i>
-</codeblock>
 <p>The tool examines every routine registered in the database and displays
 results like the following:</p>
 <codeblock>Found a matching method for: "APP"."DOINSERT"( )

Modified: db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita?rev=1567160&r1=1567159&r2=1567160&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijproprefdatasource.dita Tue Feb 11 14:46:36 2014
@@ -28,56 +28,36 @@ specifies the datasource to be used to a
 a datasource, <codeph>ij</codeph> does
 not use the DriverManager mechanism to establish connections. </p> </section>
 <refsyn><title>Syntax</title>
+<p>
 When you set the <codeph>ij.dataSource</codeph> property <codeph>ij</codeph>
will automatically try to connect to a database. To establish a connection to a specific database
using <codeph>ij.dataSource</codeph>, set the <codeph>ij.dataSource.databaseName</codeph>
property. If you do not set this property, <codeph>ij</codeph> will start with
an error. 
 If you want to create the database, specify the <codeph>ij.dataSource.createDatabase</codeph>
property as well as <codeph>ij.dataSource.databaseName</codeph>. 
 Do not specify <codeph>ij.protocol</codeph> when setting <codeph>ij.dataSource</codeph>
as that would activate the DriverManager mechanism. 
+</p>
 <codeblock>ij.dataSource=<varname>datasource class name</varname>
 ij.dataSource.databaseName=<varname>databasename</varname>
 [ij.dataSource.createDatabase=create]</codeblock>
+<p>
 If you do not specify <codeph>ij.dataSource.databaseName</codeph> and get an
error indicating no database was found, you can still connect to a database by using <codeph>ij</codeph>'s

 <xref href="rtoolsijcomref22318.dita#rtoolsijcomref22318"><codeph>connect</codeph>
command</xref>. 
 You should not specify the protocol (for example jdbc:derby:) in the <codeph>connect</codeph>
command when using <codeph>ij.dataSource</codeph>.
+</p>
 </refsyn>
-<example><title>Example 1</title> 
+<example><title>Example</title> 
 <p>In the following example, <codeph>ij</codeph> connects to a database
named 
 <codeph>sample</codeph> using an <codeph>EmbeddedDataSource</codeph>.
The 
 <codeph>sample</codeph> database is created if it does not already exist.
 </p>
-<codeblock>
-<varname>#
-# 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.
-# If your application runs with a jvm supporting JSR169, you cannot use
-# org.apache.derby.jdbc.EmbeddedDataSource, instead, use: 
-# org.apache.derby.jdbc.EmbeddedSimpleDataSource.
-#</varname><b>
-java -Dij.dataSource=org.apache.derby.jdbc.EmbeddedDataSource
+<codeblock><b>java -Dij.dataSource=org.apache.derby.jdbc.EmbeddedDataSource
 -Dij.dataSource.databaseName=sample -Dij.dataSource.createDatabase=create
   org.apache.derby.tools.ij</b>
 ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph> 
 CONNECTION0*
 * = current connection
 ij> </codeblock> </example>
-<example><title>Example 2</title> 
-<p>In the following example, <codeph>ij</codeph> starts using an 
-<codeph>EmbeddedSimpleDataSource</codeph>, without specifying 
-<codeph>ij.dataSource.databaseName</codeph>. This results in an error indicating

-no database was found. After the error, the <codeph>connect</codeph> command

-is used to create and connect to a database named <codeph>smalldb</codeph>.
-</p>
-<codeblock>
-<varname>#
-# Start ij using EmbeddedSimpleDataSource
-#</varname><b>
-java -Dij.dataSource=org.apache.derby.jdbc.EmbeddedSimpleDataSource
-  org.apache.derby.tools.ij</b> 
-ERROR XJ004: Database '' not found.
-ij version <ph conref="../conrefs.dita#vers/shortversionnumber"></ph> 
-ij> connect 'smalldb;create=true'; 
-ij> </codeblock> </example>
 <section>For more information about DataSources, refer to the JDBC documentation
-and "Using <ph conref="../conrefs.dita#prod/productshortname"></ph> as a
-J2EE Resource Manager" in the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite>.</section>
+in the <ph conref="../conrefs.dita#prod/productshortname"></ph> API
+documentation and in the <ph conref="../conrefs.dita#pub/citref"></ph>, and to
+"Using <ph conref="../conrefs.dita#prod/productshortname"></ph> as a Java EE
+Resource Manager" in the <ph conref="../conrefs.dita#pub/citdevelop"></ph>.</section>
 </refbody>
 </reference>



Mime
View raw message