You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ch...@apache.org on 2012/04/24 22:03:57 UTC
svn commit: r1329979 - in /db/derby/docs/trunk/src:
devguide/cdevdvlp51654.dita devguide/tdevdvlp36289.dita
ref/rrefattrib24612.dita ref/rrefjdbc10889.dita ref/rrefjdbc34565.dita
Author: chaase3
Date: Tue Apr 24 20:03:56 2012
New Revision: 1329979
URL: http://svn.apache.org/viewvc?rev=1329979&view=rev
Log:
DERBY-5516 Document the fact that attributes on the connection URL trump attributes specified in a connection Properties object.
Modified two Developer's Guide and three Reference Manual topics.
Patch: DERBY-5516.diff
Modified:
db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita
db/derby/docs/trunk/src/devguide/tdevdvlp36289.dita
db/derby/docs/trunk/src/ref/rrefattrib24612.dita
db/derby/docs/trunk/src/ref/rrefjdbc10889.dita
db/derby/docs/trunk/src/ref/rrefjdbc34565.dita
Modified: db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita?rev=1329979&r1=1329978&r2=1329979&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp51654.dita Tue Apr 24 20:03:56 2012
@@ -33,7 +33,10 @@ values on the client connection URL if y
a database server. For more information, see the <cite><ph conref="../conrefs.dita#pub/citadmin"></ph></cite>.</p>
<p>You can also set these attributes by passing a <i>Properties</i> object
along with a connection URL to <codeph><i>DriverManager.getConnection</i></codeph> when
-obtaining a connection; see <xref href="tdevdvlp36289.dita#tdevdvlp36289"></xref>.</p>
+obtaining a connection; see <xref href="tdevdvlp36289.dita#tdevdvlp36289"></xref>.
+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.</p>
<p>All attributes are optional. </p>
<p>For complete information about the attributes, see "Setting attributes for
the database connection URL" in the
Modified: db/derby/docs/trunk/src/devguide/tdevdvlp36289.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevdvlp36289.dita?rev=1329979&r1=1329978&r2=1329979&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevdvlp36289.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevdvlp36289.dita Tue Apr 24 20:03:56 2012
@@ -49,6 +49,9 @@ application and then restart it. To rest
<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>
</context>
</taskbody>
</task>
Modified: db/derby/docs/trunk/src/ref/rrefattrib24612.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib24612.dita?rev=1329979&r1=1329978&r2=1329979&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib24612.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib24612.dita Tue Apr 24 20:03:56 2012
@@ -28,7 +28,12 @@ a JDBC feature.</shortdesc>
the protocol and subprotocol (and, in some cases, the subsubprotocol). For
information on how you set attributes, see <xref
href="rrefjdbc10889.dita#rrefjdbc10889"></xref>. This section provides reference
-information only.</p></section>
+information only.</p>
+<p>The <i>DriverManager.getConnection</i> method can take both a connection URL
+and a <i>Properties</i> object as arguments. 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.</p>
+</section>
<section> <note>Attributes are not parsed for correctness. If you pass in
an incorrect attribute or corresponding value, it is simply ignored.</note></section>
</refbody>
Modified: db/derby/docs/trunk/src/ref/rrefjdbc10889.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc10889.dita?rev=1329979&r1=1329978&r2=1329979&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc10889.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc10889.dita Tue Apr 24 20:03:56 2012
@@ -30,7 +30,10 @@ limitations under the License.
URL. <ph conref="../conrefs.dita#prod/productshortname"></ph> translates these
attributes into properties, so you can also set attributes in a <i>Properties</i> object
passed to <i>DriverManager.getConnection</i>. (You cannot set those attributes
-as system properties, only in an object passed to the <i>DriverManager.getConnection</i> method.)</p></section>
+as system properties, only in an object passed to the <i>DriverManager.getConnection</i> method.)
+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.</p></section>
<section><p>These attributes are specific to <ph conref="../conrefs.dita#prod/productshortname"></ph> and
are listed in <xref href="rrefattrib24612.dita#rrefattrib24612"></xref>.</p></section>
<section><p>Attribute name/value pairs are converted into properties and added
Modified: db/derby/docs/trunk/src/ref/rrefjdbc34565.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc34565.dita?rev=1329979&r1=1329978&r2=1329979&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc34565.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc34565.dita Tue Apr 24 20:03:56 2012
@@ -32,7 +32,9 @@ connection URL (uniform resource locator
database.</p></section>
<section><p><i>DriverManager.getConnection</i> can take one argument besides
a database connection URL, a <i>Properties</i> object. You can use the <i>Properties</i> object
-to set database connection URL attributes.</p></section>
+to set database connection URL attributes. 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.</p></section>
<section><p><indexterm>Schemas<indexterm>APP as default</indexterm></indexterm>You
can also supply strings representing user names and passwords. When they are
supplied, <ph conref="../conrefs.dita#prod/productshortname"></ph> checks