db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r605549 - /db/derby/docs/trunk/src/devguide/
Date Wed, 19 Dec 2007 14:27:23 GMT
Author: dyre
Date: Wed Dec 19 06:27:21 2007
New Revision: 605549

URL: http://svn.apache.org/viewvc?rev=605549&view=rev
Log:
DERBY-3274: Developer's Guide has duplicate information on database connections
Patch contributed by Kim Haase
Patch file: DERBY-3274.diff

Removed:
    db/derby/docs/trunk/src/devguide/cdevdvlp10252.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp25174.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp40170.dita
    db/derby/docs/trunk/src/devguide/rdevdvlp38881.dita
    db/derby/docs/trunk/src/devguide/tdevdvlp38381.dita
Modified:
    db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp39409.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita
    db/derby/docs/trunk/src/devguide/cdevspecial29620.dita
    db/derby/docs/trunk/src/devguide/derbydev.ditamap

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita?rev=605549&r1=605548&r2=605549&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita Wed Dec 19 06:27:21 2007
@@ -44,11 +44,34 @@
 <li>you can specify the name of the database you want to connect to</li>
 <li>you can specify a number of attributes and values that allow you to accomplish
 tasks. For more information about what you can specify with the <ph conref="../conrefs.dita#prod/productshortname"></ph>
connection
-URL, see "Examples". For detailed reference about attributes and values, as
-well as syntax of the database connection URL, see the "<ph conref="../conrefs.dita#prod/productshortname"></ph>
Database
-Connection URL Syntax" in the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>.
</li>
+URL, see <xref href="rdevdvlp22102.dita#rdevdvlp22102"></xref>.</li>
 </ul>
-<p>An example use of the connection URL:</p>
-<codeblock>Connection conn=DriverManager.getConnection("jdbc:derby:sample");</codeblock>
+<p>The connection URL syntax is as follows:</p>
+<codeblock>jdbc:derby:[subsubprotocol:][<i>databaseName</i>][;<i>attribute</i>=<i>value</i>]*</codeblock>
+<p><i>Subsubprotocol</i>, which is not typically specified, determines
+how <ph conref="../conrefs.dita#prod/productshortname"></ph> looks for a database:
+in a directory, in a class path, or in a jar file. <i>Subsubprotocol</i> is one
of
+the following:</p>
+<ul>
+<li><i>directory</i>: The default. Specify this explicitly only to distinguish
+a database that might be ambiguous with one on the class path.</li>
+<li><i>classpath</i>: Databases are treated as read-only databases, and
all <i>databaseNames</i> must
+begin with at least a slash, because you specify them "relative" to the classpath
+directory. See <xref href="cdevdvlp91854.dita#cdevdvlp91854"></xref> for details.</li>
+<li><i>jar</i>: Databases are treated as read-only databases. <i>DatabaseNames</i>
might
+require a leading slash, because you specify them "relative" to the jar file.
+See <xref href="cdevdvlp24155.dita#cdevdvlp24155"></xref> for details.
+<p><i>jar</i> requires an additional element immediately before the
+database name:</p>
+<codeblock>(<i>pathToArchive</i>)</codeblock>
+<p><i>pathToArchive</i> is the path to the jar or zip file that holds
+the database.</p></li>
+</ul>
+<p>For detailed reference about connection URL attributes and values, see 
+"Setting attributes for the database connection URL" in the
+<ph conref="../conrefs.dita#pub/citref"></ph>.
+</p>
+<p>The following example shows the use of the connection URL:</p>
+<codeblock>Connection conn = DriverManager.getConnection("jdbc:derby:sample");</codeblock>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp39409.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp39409.dita?rev=605549&r1=605548&r2=605549&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp39409.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp39409.dita Wed Dec 19 06:27:21 2007
@@ -20,7 +20,12 @@
 -->
 <concept id="cdevdvlp39409" xml:lang="en-us">
 <title>Derby embedded basics</title>
-<shortdesc>This section discusses the basics of the <ph conref="../conrefs.dita#prod/productshortname"></ph>
database.</shortdesc>
+<shortdesc>This section explains how to use and configure <ph conref="../conrefs.dita#prod/productshortname"></ph>
in
+an embedded environment.</shortdesc>
 <prolog></prolog>
-<conbody></conbody>
+<conbody>
+<p>Included in the installation is a sample application program, <i>/demo/programs/simple</i>,
+which illustrates how to run <ph conref="../conrefs.dita#prod/productshortname"></ph>
embedded
+in the calling program.</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=605549&r1=605548&r2=605549&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp40653.dita Wed Dec 19 06:27:21 2007
@@ -30,10 +30,14 @@
 </metadata></prolog>
 <conbody>
 <p>In an embedded environment, 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 <codeph><i>jdbc.drivers</i></codeph> 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>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita?rev=605549&r1=605548&r2=605549&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita Wed Dec 19 06:27:21 2007
@@ -31,8 +31,7 @@
 <p>All such databases are read-only.</p>
 <p>To access an unarchived database from the classpath, specify the name of
 the database relative to the directory in the classpath. You can use the classpath
-subprotocol if such a database is ambiguous within the directory system. See <xref
-href="rdevdvlp38881.dita#rdevdvlp38881"></xref> for more information.</p>
+subprotocol if such a database is ambiguous within the directory system.</p>
 <p>For example, for a database called <i>sample</i> in <i>C:\<ph
conref="../conrefs.dita#prod/productlowercase"></ph>\demo\databases</i>,
 you can put the <i>C:\<ph conref="../conrefs.dita#prod/productlowercase"></ph>\demo\databases</i>
directory
 in the classpath and access <i>sample</i> like this:</p>

Modified: db/derby/docs/trunk/src/devguide/cdevspecial29620.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevspecial29620.dita?rev=605549&r1=605548&r2=605549&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial29620.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial29620.dita Wed Dec 19 06:27:21 2007
@@ -37,13 +37,16 @@
 <p>In order to use the same transaction, the procedure must use the same connection
 as the parent SQL statement in which the method was executed. Connections
 re-used in this way are called <i>nested connections</i>.</p>
-<p>Use the connection URL <i>jdbc:default:connection</i> to re-use the
current <codeph><i>Connection</i></codeph></p>
-<p>The Database Connection URL jdbc:default:connection allows a Java method
+<p>Use the connection URL <i>jdbc:default:connection</i> to re-use the
current <codeph><i>Connection</i></codeph>.</p>
+<p>The Database Connection URL <i>jdbc:default:connection</i> allows a
Java method
 to get the <i>Connection</i> of the SQL statement that called it. This is
 the standard (SQL standard, Part 13 SQL Routines and Java) mechanism to obtain
 the nested connection object. The method would get a <codeph><i>Connection</i></codeph>:</p>
 <codeblock>Connection conn = DriverManager.getConnection(
     "jdbc:default:connection");</codeblock>
+<p>URL attributes are not supported as part of this connection URL. Any URL
+attributes specified in a Properties object, user name, or password that are
+passed to a <i>java.sql.DriverManager.getConnection()</i> call will be ignored.</p>
 <p>Loading a JDBC driver in a database-side routine is not required.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=605549&r1=605548&r2=605549&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/trunk/src/devguide/derbydev.ditamap Wed Dec 19 06:27:21 2007
@@ -392,57 +392,6 @@
 </relrow>
 <relrow>
 <relcell>
-<topicref href="cdevdvlp40170.dita" navtitle="Embedded Derby JDBC driver">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="rdevdvlp38881.dita" navtitle="Embedded Derby JDBC database connection
URL">
-</topicref>
-<topicref href="cdevdvlp10252.dita" navtitle="Getting a nested connection">
-</topicref>
-<topicref href="tdevdvlp38381.dita" navtitle="Starting Derby as an embedded database">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="rdevdvlp38881.dita" navtitle="Embedded Derby JDBC database connection
URL">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="cdevdvlp10252.dita" navtitle="Getting a nested connection">
-</topicref>
-<topicref href="tdevdvlp38381.dita" navtitle="Starting Derby as an embedded database">
-</topicref>
-<topicref href="cdevdeploy11201.dita" navtitle="Accessing a read-only database in a zip/jar
file">
-</topicref>
-<topicref href="rdevdvlp22102.dita" navtitle="Database connection examples">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevdvlp10252.dita" navtitle="Getting a nested connection">
-</topicref>
-</relcell>
-<relcell>
-<topicref href="tdevdvlp38381.dita" navtitle="Starting Derby as an embedded database">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="cdevdeploy38918.dita" navtitle="Deployment issues"></topicref>
-</relcell>
-<relcell>
-<topicref href="cdevdeploy15325.dita" navtitle="Creating Derby databases for read-only
use">
-</topicref>
-<topicref href="cdevdeploy30736.dita" navtitle="Loading classes from a database">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
 <topicref href="cdevdeploy15325.dita" navtitle="Creating Derby databases for read-only
use">
 </topicref>
 </relcell>
@@ -1773,9 +1722,9 @@
 <relcell>
 <topicref href="cdevdvlp96597.dita" navtitle="One Derby instance for each Java Virtual
Machine">
 </topicref>
-<topicref href="cdevdvlp40170.dita" navtitle="Embedded Derby JDBC driver">
+<topicref href="cdevdvlp40653.dita" navtitle="Derby JDBC driver">
 </topicref>
-<topicref href="rdevdvlp38881.dita" navtitle="Embedded Derby JDBC database connection
URL">
+<topicref href="cdevdvlp17453.dita" navtitle="Derby JDBC database connection URL">
 </topicref>
 </relcell>
 </relrow>
@@ -1983,16 +1932,6 @@
 <topicref href="cdevstart39409.dita" navtitle="Configuring file descriptors">
 </topicref>
 <topicref href="cdevstart813545.dita" navtitle="Scripts"></topicref>
-</topicref>
-</topicref>
-<topicref href="cdevdvlp25174.dita" navtitle="Derby embedded basics">
-<topicref href="cdevdvlp40170.dita" navtitle="Embedded Derby JDBC driver">
-</topicref>
-<topicref href="rdevdvlp38881.dita" navtitle="Embedded Derby JDBC database connection
URL">
-</topicref>
-<topicref href="cdevdvlp10252.dita" navtitle="Getting a nested connection">
-</topicref>
-<topicref href="tdevdvlp38381.dita" navtitle="Starting Derby as an embedded database">
 </topicref>
 </topicref>
 <topicref href="cdevdeploy32171.dita" navtitle="Deploying Derby applications">



Mime
View raw message