db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1326640 - in /db/derby/docs/trunk/src/devguide: cdevdeploy18716.dita cdevdvlp17453.dita cdevdvlp40350.dita cdevdvlp91854.dita rdevdvlp22102.dita rdevdvlp847152.dita tdevdeploy39856.dita
Date Mon, 16 Apr 2012 15:07:12 GMT
Author: chaase3
Date: Mon Apr 16 15:07:11 2012
New Revision: 1326640

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

Puzzling documentation about the URL to a database on the classpath

Modified 7 Developer's Guide topics.

Patch: DERBY-5612.diff

Modified:
    db/derby/docs/trunk/src/devguide/cdevdeploy18716.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita
    db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita
    db/derby/docs/trunk/src/devguide/rdevdvlp847152.dita
    db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy18716.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdeploy18716.dita?rev=1326640&r1=1326639&r2=1326640&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy18716.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy18716.dita Mon Apr 16 15:07:11 2012
@@ -32,6 +32,6 @@ with databases in file system</indexterm
 <p>If this is the case, the connection attempt might fail or connect to the
 wrong database. Use the form of the syntax with the subsubprotocol to distinguish
 between the databases.</p>
-<p>For example:<codeblock>jdbc:derby:classpath:/products/boiledfood</codeblock></p>
+<p>For example:<codeblock>jdbc:derby:classpath:products/boiledfood</codeblock></p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita?rev=1326640&r1=1326639&r2=1326640&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp17453.dita Mon Apr 16 15:07:11 2012
@@ -58,9 +58,9 @@ a database that might be ambiguous with 
 <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>
-<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>classpath</i>: Databases are treated as read-only databases, relative
to
+the <i>classpath</i> 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.

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita?rev=1326640&r1=1326639&r2=1326640&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp40350.dita Mon Apr 16 15:07:11 2012
@@ -51,9 +51,10 @@ creates any intermediate directory that 
 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 "Special Database
-Access"), use the <i>directory:</i> subsubprotocol to specify the one in the
-file system. For example:</p>
+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/cdevdvlp91854.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita?rev=1326640&r1=1326639&r2=1326640&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita Mon Apr 16 15:07:11 2012
@@ -29,21 +29,20 @@ can be archived into a jar or zip file o
 </metadata></prolog>
 <conbody>
 <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.</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>
+<p>To access an unarchived database from the classpath, use the
+<i>classpath</i> subsubprotocol.</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>
 <codeblock>
-jdbc:derby:/sample
+jdbc:derby:classpath:sample
 </codeblock>
-<p>The forward slash is required before <i>sample</i> to indicate that
it
-is relative to <i>C:\<ph conref="../conrefs.dita#prod/productlowercase"></ph>\demo\databases</i>
directory.</p>
-<p>If only <i>C:\<ph conref="../conrefs.dita#prod/productlowercase"></ph></i>
were
-in the class path, you could access <i>sample</i> (read-only) like this:</p>
+<p>If only <i>C:\<ph conref="../conrefs.dita#prod/productlowercase"></ph></i>
+were in the classpath, you could access <i>sample</i> (read-only) like this:</p>
 <codeblock>
-jdbc:derby:/demo/databases/sample
+jdbc:derby:classpath:demo/databases/sample
 </codeblock>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita?rev=1326640&r1=1326639&r2=1326640&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita Mon Apr 16 15:07:11 2012
@@ -59,7 +59,7 @@ a directory in the classpath) as a read-
 <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
+<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>

Modified: db/derby/docs/trunk/src/devguide/rdevdvlp847152.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevdvlp847152.dita?rev=1326640&r1=1326639&r2=1326640&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevdvlp847152.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevdvlp847152.dita Mon Apr 16 15:07:11 2012
@@ -35,6 +35,6 @@ the subsubprotocol, like this:</p></sect
 <example> <codeblock>jdbc:derby:jar:(<i>pathToArchive</i>)<i>databasePathWithinArchive</i></codeblock></example>
 <section><p>Or, if the jar or zip file has been included in the classpath,
 like this:</p></section>
-<example> <codeblock>jdbc:derby:/<i>databasePathWithinArchive</i></codeblock></example>
+<example> <codeblock>jdbc:derby:classpath:<i>databasePathWithinArchive</i></codeblock></example>
 </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=1326640&r1=1326639&r2=1326640&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita Mon Apr 16 15:07:11 2012
@@ -31,7 +31,7 @@ path of the archive.</shortdesc>
 </metadata></prolog>
 <taskbody>
 <context> <p>When jar or zip files are part of the classpath, you do not have
-to specify the jar subsubprotocol to connect to them.</p><p>To access a database
+to specify 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
@@ -40,10 +40,10 @@ up <ph conref="../conrefs.dita#prod/prod
 <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>
+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>
+jdbc:derby:classpath:products/boiledfood</codeblock></p></result>
 </taskbody>
 </task>



Mime
View raw message