db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1327511 - in /db/derby/docs/trunk/src/devguide: cdevdeploy18716.dita cdevdeploy856333.dita cdevdvlp17453.dita cdevdvlp24155.dita cdevdvlp40350.dita derbydev.ditamap rdevdvlp22102.dita tdevdeploy39856.dita
Date Wed, 18 Apr 2012 13:58:41 GMT
Author: chaase3
Date: Wed Apr 18 13:58:41 2012
New Revision: 1327511

URL: http://svn.apache.org/viewvc?rev=1327511&view=rev
Log:
DERBY-5612  Puzzling documentation about the URL to a database on the classpath

Modified 6 Developer's Guide topics and deleted 2.

Patch: DERBY-5612-2.diff

Removed:
    db/derby/docs/trunk/src/devguide/cdevdeploy18716.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy856333.dita
Modified:
    db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita
    db/derby/docs/trunk/src/devguide/derbydev.ditamap
    db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita
    db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita?rev=1327511&r1=1327510&r2=1327511&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita Wed Apr 18 13:58:41 2012
@@ -53,8 +53,9 @@ how <ph conref="../conrefs.dita#prod/pro
 in a directory, in memory, 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>directory</i>: The default, which need not be specified explicitly.
The
+database is in the file system, and the path is either relative to the system
+directory or absolute.</li>
 <li><i>memory</i>: Databases exist only in main memory and are not written
to
 disk. An in-memory database may be useful when there is no need to persist the
 database -- for example, in some testing situations.</li>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita?rev=1327511&r1=1327510&r2=1327511&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita Wed Apr 18 13:58:41 2012
@@ -29,13 +29,13 @@ does not have to be on the classpath.</s
 a file called <i>jar1.jar</i>. This archive is in the classpath before you
 start up <ph conref="../conrefs.dita#prod/productshortname"></ph>. You can
 access <i>jarDB1</i> with the following connection URL</p>
-<codeblock>jdbc:derby:/jarDB1</codeblock>
+<codeblock>jdbc:derby:classpath:jarDB1</codeblock>
 <p>To access a database in a jar file that is not on the classpath, use the
-jar subprotocol. </p>
+<i>jar</i> subprotocol. </p>
 <p>For example, suppose you have archived the database <i>jarDB2</i> into
 a file called <i>jar2.jar</i>. This archive is not in the classpath. You can
 access <i>jarDB2</i> by specifying the path to the jar file along with the
-jar subsubprotocol, like this:</p>
+<i>jar</i> subsubprotocol, like this:</p>
 <codeblock>
 jdbc:derby:jar:(c:/<ph conref="../conrefs.dita#prod/productlowercase"></ph>/lib/jar2.jar)jarDB2
 </codeblock>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita?rev=1327511&r1=1327510&r2=1327511&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita Wed Apr 18 13:58:41 2012
@@ -50,11 +50,5 @@ from <cite>java.io.File.getCanonicalPath
 creates any intermediate directory that does not already exist when creating
 a new database. If it cannot create the intermediate directory, the database
 creation fails.</p>
-<p>If the path to the database is ambiguous, i.e., potentially the same as
-that to a database that is available on the classpath (see
-<xref href="cdevdvlp19700.dita#cdevdvlp19700"></xref>), use the
-<i>directory:</i> subsubprotocol to specify the one in the file system. For
-example:</p>
-<codeblock>jdbc:derby:directory:myDB</codeblock>
 </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=1327511&r1=1327510&r2=1327511&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/trunk/src/devguide/derbydev.ditamap Wed Apr 18 13:58:41 2012
@@ -493,16 +493,6 @@ limitations under the License.
 </relrow>
 <relrow>
 <relcell>
-<topicref href="cdevdeploy856333.dita" navtitle="Connecting to databases when the path
is ambiguous because of databases
-in the classpath"></topicref>
-</relcell>
-<relcell>
-<topicref href="cdevdeploy18716.dita" navtitle="Connecting to databases with ambiguous
paths to databases in the file
-system"></topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
 <topicref href="cdevdeploy856753.dita" navtitle="Class loading overview">
 </topicref>
 <topicref href="cdevdeploy15818.dita" navtitle="Create jar files for your application">
@@ -1844,10 +1834,6 @@ system"></topicref>
 <topicref href="cdevdeploy11201.dita" navtitle="Accessing a read-only database in a zip/jar
file">
 </topicref>
 <topicref href="tdevdeploy39856.dita" navtitle="Accessing databases within a jar file
using the classpath">
-<topicref href="cdevdeploy18716.dita" navtitle="Connecting to databases with ambiguous
paths to databases in the file
-system"></topicref>
-<topicref href="cdevdeploy856333.dita" navtitle="Connecting to databases when the path
is ambiguous because of databases
-in the classpath"></topicref>
 </topicref>
 <topicref href="cdevdeploy82529.dita" navtitle="Databases on read-only media and DatabaseMetaData">
 </topicref>

Modified: db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita?rev=1327511&r1=1327510&r2=1327511&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita Wed Apr 18 13:58:41 2012
@@ -39,8 +39,7 @@ of the directory <i>london</i>.</p></li>
 <li><i>jdbc:derby:/reference/phrases/french</i>   <p>Open a connection
to
 the database <i>/reference/phrases/french</i>.</p>  <p>On a UNIX
system, this
 would be the path of the directory. On a Windows system, the path would be <i>C:\reference\phrases\french</i>
if
-the current drive were <i>C. </i>If a jar file storing databases were in the
-user's classpath, this could also be a path within the jar file.</p></li>
+the current drive were <i>C</i>.</p></li>
 <li><i>jdbc:derby:a:/demo/sample</i>   <p>Open a connection to the
database
 stored in the directory <i>\demo\sample</i> on drive <i>A</i> (usually
the
 floppy drive) on a Windows system.</p></li>
@@ -54,21 +53,16 @@ it does not exist.</p></li>
 <li><i>jdbc:derby:sample;shutdown=true</i>   <p>Shut down the <i>sample</i>
database.
 (Authentication is not enabled, so no user credentials are required.)
 </p></li>
-<li><i>jdbc:derby:/myDB</i>   <p>Access <i>myDB</i> (which
is directly in
-a directory in the classpath) as a read-only database.</p></li>
 <li><i>jdbc:derby:memory:myDB</i>   <p>Access the in-memory database
named
 <i>myDB</i>. The syntax for a client connection URL is different; see
 <xref href="cdevdvlpinmemdb.dita#cdevdvlpinmemdb"></xref> for details.</p></li>
 <li><i>jdbc:derby:classpath:myDB</i>   <p>Access <i>myDB</i>
(which is directly
-in a directory in the classpath) as a read-only database. The reason for using
-the subsubprotocol is that it might  have the same path as a database in the
-directory structure.</p></li>
+in a directory in the classpath) as a read-only database.</p></li>
 <li><i>jdbc:derby:jar:(C:/dbs.jar)products/boiledfood</i>   <p>Access
the
 read-only database <i>boiledfood</i> in the <i>products</i> directory
from
 the jar file <i>C:/dbs.jar</i>.</p></li>
 <li><i>jdbc:derby:directory:myDB</i>   <p>Access <i>myDB</i>,
which is in
-the system directory. The reason for using the <codeph><i>directory:</i></codeph>
subsubprotocol
-is that it might happen to have the same path as a database in the classpath.</p></li>
+the system directory.</p></li>
 </ul></section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita?rev=1327511&r1=1327510&r2=1327511&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita Wed Apr 18 13:58:41 2012
@@ -30,20 +30,20 @@ path of the archive.</shortdesc>
 </keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>When jar or zip files are part of the classpath, you do not have
-to specify the <i>jar</i> subsubprotocol to connect to them.</p><p>To
access a database
+<context> <p>When jar or zip files are part of the classpath, you specify the
+<i>classpath</i> subsubprotocol instead of the <i>jar</i> subsubprotocol
to
+connect to them.</p><p>To access a database
 in a zip or jar file in the classpath:</p></context>
 <steps>
 <step><cmd>Set the classpath to include the jar or zip file before starting
 up <ph conref="../conrefs.dita#prod/productshortname"></ph>:</cmd><info><codeblock>CLASSPATH="C:\dbs.jar;%CLASSPATH%"</codeblock></info>
 </step>
-<step><cmd>Connect to a database within the jar or zip file with one of the
-following connection URLs:</cmd><info><codeblock><b>Standard syntax:</b>
-jdbc:derby:/<i>databasePathWithinArchive</i></codeblock><codeblock><b>Syntax
with subsubprotocol:</b>
-jdbc:derby:classpath:<i>databasePathWithinArchive</i></codeblock></info>
+<step><cmd>Connect to a database within the jar or zip file with the
+following connection URL:</cmd><info>
+<codeblock>jdbc:derby:classpath:<i>databasePathWithinArchive</i></codeblock></info>
 </step>
 </steps>
-<result> <p>For example:<codeblock>jdbc:derby:/products/boiledfood
-jdbc:derby:classpath:products/boiledfood</codeblock></p></result>
+<result><p>For example:</p>
+<codeblock>jdbc:derby:classpath:products/boiledfood</codeblock></result>
 </taskbody>
 </task>



Mime
View raw message