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 jt...@apache.org on 2006/03/17 22:12:03 UTC
svn commit: r386714 [2/9] - /db/derby/docs/trunk/src/devguide/
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts36881.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts36881.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts36881.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts36881.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,27 +17,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts36881">
+<concept id="cdevconcepts36881" xml:lang="en-us">
<title>Connections</title>
+<shortdesc>A <i>Connection</i> object represents a connection with a database.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>JDBC Connections<indexterm>definition</indexterm></indexterm>
-<indexterm>Connections<indexterm>getting</indexterm></indexterm>
-<indexterm>Connecting to multiple databases</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>JDBC Connections<indexterm>definition</indexterm></indexterm>
+<indexterm>Connections<indexterm>getting</indexterm></indexterm><indexterm>Connecting
+to multiple databases</indexterm></keywords>
+</metadata></prolog>
<conbody>
-<p>A <i>Connection</i> object represents a connection with
-a database. Within the scope of one <codeph><i>Connection</i></codeph>,
-you access only a single <ph conref="devconrefs.dita#prod/productshortname"></ph> database. (Database-side JDBC procedures
-can allow you to access more than one database in some circumstances.) A single application might allow one
-or more <codeph><i>Connections</i></codeph> to <ph conref="devconrefs.dita#prod/productshortname"></ph>, either
-to a single database or to many different databases, provided that all the
-databases are within the same system (see <xref href="cdevdvlp27610.dita#cdevdvlp27610"/>).</p>
-<p>With DriverManager, you use the connection URL as an argument to get the <codeph><i>getConnection</i></codeph> method to specify which database to
-connect to and other details (see <xref href="cdevdvlp17453.dita#cdevdvlp17453"/>).</p>
+<p>Within the scope of one <codeph><i>Connection</i></codeph>, you access
+only a single <ph conref="devconrefs.dita#prod/productshortname"></ph> database.
+(Database-side JDBC procedures can allow you to access more than one database
+in some circumstances.) A single application might allow one or more <codeph><i>Connections</i></codeph> to <ph
+conref="devconrefs.dita#prod/productshortname"></ph>, either to a single database
+or to many different databases, provided that all the databases are within
+the same system.</p>
+<p>With DriverManager, you use the connection URL as an argument to get the <codeph><i>getConnection</i></codeph> method
+to specify which database to connect to and other details.</p>
<p>The following example shows an application establishing three separate
connections to two different databases in the current system.</p>
<codeblock>Connection conn = DriverManager.getConnection(
@@ -49,7 +49,8 @@
"jdbc:derby:newDB");
System.out.println("Got second connection to newDB");
conn3.setAutoCommit(false);</codeblock>
-<p>A <i>Connection</i> object has no association with any
-specific thread; during its lifetime, any number of threads might have access
-to it, as controlled by the application.</p>
-</conbody></concept>
+<p>A <i>Connection</i> object has no association with any specific thread;
+during its lifetime, any number of threads might have access to it, as controlled
+by the application.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts38375.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts38375.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts38375.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts38375.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,20 +17,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts38375">
+<concept id="cdevconcepts38375" xml:lang="en-us">
<title>The JDBC Connection and Transaction Model</title>
+<shortdesc>Session and transaction capabilities for SQL are handled through
+JDBC procedures, not by SQL commands.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>JDBC Connections</indexterm>
-<indexterm>Transactions</indexterm>
+<keywords><indexterm>JDBC Connections</indexterm><indexterm>Transactions</indexterm>
</keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
<conbody>
-<p>Session and transaction capabilities for SQL are handled through JDBC procedures,
-not by SQL commands.</p>
<p>JDBC defines a system session and transaction model for database access.
-A <i>session</i> is the duration of one connection to the
-database and is handled by a JDBC <codeph><i>Connection</i></codeph> object.</p>
-</conbody></concept>
+A <i>session</i> is the duration of one connection to the database and is
+handled by a JDBC <codeph><i>Connection</i></codeph> object.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts41275.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts41275.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts41275.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts41275.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,20 +17,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts41275">
+<concept id="cdevconcepts41275" xml:lang="en-us">
<title>SQL and JDBC ResultSet/Cursor mechanisms</title>
+<shortdesc>A cursor provides you with the ability to step through and process
+the rows in a <i>ResultSet</i> one by one.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>Cursors<indexterm>working with</indexterm></indexterm>
-<indexterm>ResultSets<indexterm>working with</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Cursors<indexterm>working with</indexterm></indexterm>
+<indexterm>ResultSets<indexterm>working with</indexterm></indexterm></keywords>
+</metadata></prolog>
<conbody>
-<p>A cursor provides you with the ability to step through and process the
-rows in a <i>ResultSet</i> one by one. A <codeph><i>java.sql.ResultSet</i></codeph> object constitutes a cursor. You do not need
-to use a language construct, such as SQL-92's DECLARE CURSOR, to work
-with cursors in a Java application. In <ph conref="devconrefs.dita#prod/productshortname"></ph>, any SELECT statement generates
-a cursor.</p>
-</conbody></concept>
+<p>A <codeph><i>java.sql.ResultSet</i></codeph> object constitutes a cursor.
+You do not need to use a language construct, such as SQL-92's DECLARE CURSOR,
+to work with cursors in a Java application. In <ph conref="devconrefs.dita#prod/productshortname"></ph>,
+any SELECT statement generates a cursor.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts50894.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts50894.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts50894.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts50894.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,15 +17,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts50894">
+<concept id="cdevconcepts50894" xml:lang="en-us">
<title>Debugging Deadlocks</title>
-<prolog>
-</prolog>
+<shortdesc>If deadlocks occur frequently in your multi-user system with a
+particular application, you might need to do some debugging.</shortdesc>
+<prolog></prolog>
<conbody>
-<p>If deadlocks occur frequently in your multi-user system with a particular
-application, you might need to do some debugging. <ph conref="devconrefs.dita#prod/productshortname"></ph> provides a class
-to help you in this situation, <i>org.apache.derby.diag.LockTable</i>. You can also set the property <i>derby.locks.deadlockTrace</i> to dump additional information to the <ph conref="devconrefs.dita#prod/productshortname"></ph>.log file about any deadlocks
-that occur on your system. See the Tuning Guide for more information on this
-property. For information, see the <cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite>.</p>
-</conbody></concept>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides a class
+to help you in this situation, <i>org.apache.derby.diag.LockTable</i>. You
+can also set the property <i>derby.locks.deadlockTrace</i> to dump additional
+information to the <ph conref="devconrefs.dita#prod/productshortname"></ph>.log
+file about any deadlocks that occur on your system. See the Tuning Guide for
+more information on this property. For information, see the <cite><ph conref="devconrefs.dita#pub/citadmin"></ph></cite>.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts53677.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts53677.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts53677.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts53677.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,23 +17,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts53677">
-<title>Avoiding Deadlocks</title>
-<prolog>
-</prolog>
+<concept id="cdevconcepts53677" xml:lang="en-us">
+<title>Avoiding deadlocks</title>
+<shortdesc>Using both row-level locking and the TRANSACTION_READ_COMMITTED
+isolation level makes it likely that you will avoid deadlocks (both settings
+are <ph conref="devconrefs.dita#prod/productshortname"></ph> defaults). However,
+deadlocks are still possible.</shortdesc>
+<prolog></prolog>
<conbody>
-<p>Using both row-level locking and the TRANSACTION_READ_COMMITTED isolation
-level makes it likely that you will avoid deadlocks (both settings are <ph conref="devconrefs.dita#prod/productshortname"></ph> defaults).
-However, deadlocks are still possible. <ph conref="devconrefs.dita#prod/productshortname"></ph> application developers
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> application developers
can avoid deadlocks by using consistent application logic; for example, transactions
-that access <i>Accounts</i> and <i>Orders</i> should always access the tables in the same order. That way, in the
-scenario described above, Transaction B simply waits for transaction A to
-release the lock on <i>Orders</i> before it begins. When
-transaction A releases the lock on <i>Orders</i>, Transaction
+that access <i>Accounts</i> and <i>Orders</i> should always access the tables
+in the same order. That way, in the scenario described above, Transaction
+B simply waits for transaction A to release the lock on <i>Orders</i> before
+it begins. When transaction A releases the lock on <i>Orders</i>, Transaction
B can proceed freely.</p>
<p>Another tool available to you is the LOCK TABLE statement. A transaction
can attempt to lock a table in exclusive mode when it starts to prevent other
-transactions from getting shared locks on a table. For more information, see "LOCK
-TABLE statement" in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
-</conbody></concept>
+transactions from getting shared locks on a table. For more information, see
+"LOCK TABLE statement" in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts65864.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts65864.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts65864.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts65864.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,16 +17,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
<concept id="cdevconcepts65864" xml:lang="en-us">
<title>Multi-thread programming tips</title>
+<shortdesc>You may be sharing a <i>Connection</i> among multiple threads because
+you have experienced poor concurrency using separate transactions.</shortdesc>
<prolog></prolog>
<conbody>
-<p>Some programmers might share a <i>Connection</i> among multiple threads
-because they have experienced poor concurrency using separate transactions.
-Here are some tips for increasing concurrency:</p>
+<p>Here are some tips for increasing concurrency:</p>
<ul>
<li>Use row-level locking.</li>
<li>Use the <i>TRANSACTION_READ_COMMITTED</i> isolation level.</li>
@@ -36,4 +36,3 @@
For more information, see in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</p>
</conbody>
</concept>
-
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts838179.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts838179.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts838179.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts838179.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,16 +17,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts838179">
+<concept id="cdevconcepts838179" xml:lang="en-us">
<title>Statements</title>
+<shortdesc>To execute SQL statements against a database, an application uses <i>Statements</i> (<codeph><i>java.sql.Statement</i></codeph>)
+and <i>PreparedStatements</i> (<codeph><i>java.sql.PreparedStatement</i></codeph>),
+or <i>CallableStatements</i> (<codeph><i>java.sql.CallableStatement</i></codeph>)
+for stored procedures.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>JDBC Statement<indexterm>definition</indexterm></indexterm>
+<keywords><indexterm>JDBC Statement<indexterm>definition</indexterm></indexterm>
</keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
<conbody>
-<p>To execute SQL statements against a database, an application uses <i>Statements</i> (<codeph><i>java.sql.Statement</i></codeph>) and <i>PreparedStatements</i> (<codeph><i>java.sql.PreparedStatement</i></codeph>), or <i>CallableStatements</i> (<codeph><i>java.sql.CallableStatement</i></codeph>) for stored procedures. Because <i>PreparedStatement</i> extends <i>Statement</i> and <i>CallableStatement</i> extends<i> PreparedStatement</i>, this section refers to both as <i>Statements</i>. <i>Statements</i> are obtained from and
-are associated with a particular <i>Connection</i>.</p>
-</conbody></concept>
+<p>Because <i>PreparedStatement</i> extends <i>Statement</i> and <i>CallableStatement</i> extends<i> PreparedStatement</i>,
+this section refers to both as <i>Statements</i>. <i>Statements</i> are obtained
+from and are associated with a particular <i>Connection</i>.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts838315.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts838315.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts838315.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts838315.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,23 +17,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts838315">
+<concept id="cdevconcepts838315" xml:lang="en-us">
<title>ResultSets and Cursors</title>
+<shortdesc>Executing a <i>Statement</i> that returns values gives a <codeph><i>ResultSet</i></codeph> (<codeph><i>java.sql.ResultSet</i></codeph>),
+allowing the application to obtain the results of the statement. Only one <codeph><i>ResultSet</i></codeph> can
+be open for a particular <codeph><i>Statement</i></codeph> at any time, as
+per the JDBC specification.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>Cursors<indexterm>all result sets as</indexterm></indexterm>
+<keywords><indexterm>Cursors<indexterm>all result sets as</indexterm></indexterm>
</keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
<conbody>
-<p>Executing a <i>Statement</i> that returns values gives
-a <codeph><i>ResultSet</i></codeph> (<codeph><i>java.sql.ResultSet</i></codeph>), allowing the application to obtain the results of the statement.
-Only one <codeph><i>ResultSet</i></codeph> can be open for a particular <codeph><i>Statement</i></codeph> at any time, as per the JDBC specification.</p>
-<p>Thus, executing a <i>Statement</i> automatically closes
-any open <codeph><i>ResultSet</i></codeph> generated by an earlier
-execution of that <codeph><i>Statement</i></codeph>.</p>
-<p>For this reason, you must use a different <i>Statement</i> to update a cursor (a named <codeph><i>ResultSet</i></codeph>)
-from the one used to generate the cursor. </p>
-<p>The names of open cursors must be unique within a <i>Connection</i>. For more information about how to use cursors and <codeph><i>ResultSets</i></codeph>, see <xref href="cdevconcepts41275.dita#cdevconcepts41275"/>.</p>
-</conbody></concept>
+<p>Thus, executing a <i>Statement</i> automatically closes any open <codeph><i>ResultSet</i></codeph> generated
+by an earlier execution of that <codeph><i>Statement</i></codeph>.</p>
+<p>For this reason, you must use a different <i>Statement</i> to update a
+cursor (a named <codeph><i>ResultSet</i></codeph>) from the one used to generate
+the cursor. </p>
+<p>The names of open cursors must be unique within a <i>Connection</i>.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts838850.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts838850.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts838850.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts838850.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,31 +17,29 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts838850">
+<concept id="cdevconcepts838850" xml:lang="en-us">
<title>Transactions when auto-commit is disabled</title>
+<shortdesc>When auto-commit is disabled, you use a <i>Connection</i> object's <codeph><i>commit</i></codeph> and <codeph><i>rollback</i></codeph> methods
+to commit or roll back a transaction.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>Auto-commit<indexterm>and transactions</indexterm></indexterm>
+<keywords><indexterm>Auto-commit<indexterm>and transactions</indexterm></indexterm>
</keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
<conbody>
-<p>When auto-commit is disabled (see <xref href="cdevconcepts29416.dita#cdevconcepts29416"/>),
-you use a <i>Connection</i> object's <codeph><i>commit</i></codeph> and <codeph><i>rollback</i></codeph> methods
-to commit or roll back a transaction. The <codeph><i>commit</i></codeph> method
-makes permanent the changes resulting from the transaction and releases locks.
-The <codeph><i>rollback</i></codeph> method undoes all the changes
-resulting from the transaction and releases locks. A transaction encompasses
-all the SQL statements executed against a single <codeph><i>Connection</i></codeph> object since the last <codeph><i>commit</i></codeph> or <codeph><i>rollback</i></codeph>.</p>
+<p>The <codeph><i>commit</i></codeph> method makes permanent the changes resulting
+from the transaction and releases locks. The <codeph><i>rollback</i></codeph> method
+undoes all the changes resulting from the transaction and releases locks.
+A transaction encompasses all the SQL statements executed against a single <codeph><i>Connection</i></codeph> object
+since the last <codeph><i>commit</i></codeph> or <codeph><i>rollback</i></codeph>.</p>
<p>You do not need to explicitly begin a transaction. You implicitly end one
transaction and begin a new one after disabling auto-commit, changing the
isolation level, or after calling <codeph><i>commit</i></codeph> or <codeph><i>rollback</i></codeph>.</p>
-<p>Committing a transaction also closes all <codeph><i>ResultSet</i></codeph> objects excluding the <codeph><i>ResultSet</i></codeph> objects
-associated with cursors with holdability <codeph>true</codeph>. The default holdability
-of the cursors is <codeph>true</codeph> and <codeph><i>ResultSet</i></codeph> objects
-associated with them need to be closed explicitly. A commit will not close
-such <codeph><i>ResultSet</i></codeph> objects. (See <xref href="rdevconceptsholdablecursors.dita#rdevconceptsholdablecursors"/> for more information.) It also releases any database locks
-currently held by the <codeph><i>Connection</i></codeph>, whether
-or not these objects were created in different threads.</p>
-</conbody></concept>
+<p>Committing a transaction also closes all <codeph><i>ResultSet</i></codeph> objects
+excluding the <codeph><i>ResultSet</i></codeph> objects associated with cursors
+with holdability <codeph>true</codeph>. The default holdability of the cursors
+is <codeph>true</codeph> and <codeph><i>ResultSet</i></codeph> objects associated
+with them need to be closed explicitly. A commit will not close such <codeph><i>ResultSet</i></codeph> objects.
+It also releases any database locks currently held by the <codeph><i>Connection</i></codeph>,
+whether or not these objects were created in different threads.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts839085.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts839085.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts839085.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts839085.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,20 +17,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts839085">
+<concept id="cdevconcepts839085" xml:lang="en-us">
<title>Explicitly closing Statements, ResultSets, and Connections</title>
+<shortdesc>You should explicitly close <i>Statements</i>, <codeph><i>ResultSets,</i></codeph> and <codeph><i>Connections</i></codeph> when
+you no longer need them.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>Explicit close of JDBC objects</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Explicit close of JDBC objects</indexterm></keywords>
+</metadata></prolog>
<conbody>
-<p>You should explicitly close <i>Statements</i>, <codeph><i>ResultSets,</i></codeph> and <codeph><i>Connections</i></codeph> when you no longer need them. Connections to <ph conref="devconrefs.dita#prod/productshortname"></ph> are resources
-external to an application, and the garbage collector will not close them
-automatically. </p>
-<p>For example, close a <i>Statement</i> object using its <codeph><i>close</i></codeph> method; close a <codeph><i>Connection</i></codeph> object using its <codeph><i>close</i></codeph> method.
+<p>Connections to <ph conref="devconrefs.dita#prod/productshortname"></ph> are
+resources external to an application, and the garbage collector will not close
+them automatically. </p>
+<p>For example, close a <i>Statement</i> object using its <codeph><i>close</i></codeph> method;
+close a <codeph><i>Connection</i></codeph> object using its <codeph><i>close</i></codeph> method.
If auto-commit is disabled, active transactions need to be explicitly committed
or rolled back before closing the connection</p>
-</conbody></concept>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts840995.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts840995.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts840995.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts840995.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,18 +17,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts840995">
+<concept id="cdevconcepts840995" xml:lang="en-us">
<title>Holdable cursors and autocommit</title>
+<shortdesc>When autocommit is on, positioned updates and deletes are not supported
+for <i>ResultSet</i> objects that hold cursors open. If you attempt an update
+or delete, an exception is thrown.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>Holdable cursors and autocommit</indexterm>
-<indexterm>Autocommit<indexterm>holdable cursors and</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
-<conbody>
-<p>When autocommit is on, positioned updates and deletes are not supported
-for <i>ResultSet</i> objects that hold cursors open. If you
-attempt an update or delete, an exception is thrown.</p>
-</conbody></concept>
+<keywords><indexterm>Holdable cursors and autocommit</indexterm><indexterm>Autocommit<indexterm>holdable
+cursors and</indexterm></indexterm></keywords>
+</metadata></prolog>
+<conbody></conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts842279.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts842279.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts842279.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts842279.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,19 +17,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts842279">
+<concept id="cdevconcepts842279" xml:lang="en-us">
<title>Exclusive locks</title>
+<shortdesc>When a statement modifies data, its transaction holds an <i>exclusive</i> lock
+on data that prevents other transactions from accessing the data.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>Exclusive locks<indexterm>definition</indexterm></indexterm>
-<indexterm>Shared locks<indexterm>definition</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Exclusive locks<indexterm>definition</indexterm></indexterm>
+<indexterm>Shared locks<indexterm>definition</indexterm></indexterm></keywords>
+</metadata></prolog>
<conbody>
-<p>When a statement modifies data, its transaction holds an <i>exclusive</i> lock on data that prevents other transactions from accessing
-the data. This lock remains in place until the transaction holding the lock
-issues a commit or rollback. Table-level locking lowers concurrency in a multi-user
+<p>This lock remains in place until the transaction holding the lock issues
+a commit or rollback. Table-level locking lowers concurrency in a multi-user
system.</p>
-</conbody></concept>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts842304.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts842304.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts842304.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts842304.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,21 +17,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts842304">
+<concept id="cdevconcepts842304" xml:lang="en-us">
<title>Shared locks</title>
-<prolog>
-</prolog>
+<shortdesc>When a statement reads data without making any modifications, its
+transaction obtains a <i>shared lock</i> on the data.</shortdesc>
+<prolog></prolog>
<conbody>
-<p>When a statement reads data without making any modifications, its transaction
-obtains a <i>shared lock</i> on the data. Another transaction
-that tries to read the same data is permitted to read, but a transaction that
-tries to update the data will be prevented from doing so until the shared
-lock is released. How long this shared lock is held depends on the isolation
-level of the transaction holding the lock. Transactions using the TRANSACTION_READ_COMMITTED
-isolation level release the lock when the transaction steps through to the
-next row. Transactions using the TRANSACTION_SERIALIZABLE or TRANSACTION_REPEATABLE_READ
-isolation level hold the lock until the transaction is committed, so even
-a SELECT can prevent updates if a commit is never issued. Transactions using
-the TRANSACTION_READ_UNCOMMITTED isolation level do not request any locks.</p>
-</conbody></concept>
+<p>Another transaction that tries to read the same data is permitted to read,
+but a transaction that tries to update the data will be prevented from doing
+so until the shared lock is released. How long this shared lock is held depends
+on the isolation level of the transaction holding the lock. Transactions using
+the TRANSACTION_READ_COMMITTED isolation level release the lock when the transaction
+steps through to the next row. Transactions using the TRANSACTION_SERIALIZABLE
+or TRANSACTION_REPEATABLE_READ isolation level hold the lock until the transaction
+is committed, so even a SELECT can prevent updates if a commit is never issued.
+Transactions using the TRANSACTION_READ_UNCOMMITTED isolation level do not
+request any locks.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts842385.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts842385.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts842385.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts842385.dita Fri Mar 17 13:11:50 2006
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "concept.dtd">
<!--
-Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
+Copyright 1997, 2006 The Apache Software Foundation or its licensors, as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -19,15 +18,15 @@
-->
<concept id="cdevconcepts842385" xml:lang="en-us">
<title>Update locks</title>
+<shortdesc>When a user-defined update cursor (created with the FOR UPDATE
+clause) reads data, its transaction obtains an <i>update</i> lock on the data.</shortdesc>
<prolog><metadata>
<keywords><indexterm>Update locks</indexterm></keywords>
</metadata></prolog>
<conbody>
-<p>When a user-defined update cursor (created with the FOR UPDATE clause)
-reads data, its transaction obtains an <i>update</i> lock on the data. If
-the user-defined update cursor updates the data, the update lock is converted
-to an exclusive lock. If the cursor does not update the row, when the transaction
-steps through to the next row, transactions using the TRANSACTION_READ_COMMITTED
+<p>If the user-defined update cursor updates the data, the update lock is
+converted to an exclusive lock. If the cursor does not update the row, when
+the transaction steps through to the next row, transactions using the TRANSACTION_READ_COMMITTED
isolation level release the lock. (For update locks, the TRANSACTION_READ_UNCOMMITTED
isolation level acts the same way as TRANSACTION_READ_COMMITTED.)</p>
<p>Update locks help minimize deadlocks.</p>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts842613.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts842613.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts842613.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts842613.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,16 +17,15 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts842613">
+<concept id="cdevconcepts842613" xml:lang="en-us">
<title>Notes on locking</title>
-<prolog>
-</prolog>
+<shortdesc>In addition to the locks already described, foreign key lookups
+require briefly held shared locks on the referenced table (row or table, depending
+on the configuration).</shortdesc>
+<prolog></prolog>
<conbody>
-<p>In addition to the locks already described, foreign key lookups require
-briefly held shared locks on the referenced table (row or table, depending
-on the configuration).</p>
<p>The table and examples in this section do not take performance-based lock
escalation into account. Remember that the system can choose table-level locking
for performance reasons.</p>
-</conbody></concept>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts844813.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts844813.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts844813.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts844813.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,21 +17,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts844813">
+<concept id="cdevconcepts844813" xml:lang="en-us">
<title>Information provided in SQLExceptions</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> provides
+the message, <i>SQLState</i> values, and error codes.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>SQLWarnings</indexterm>
-<indexterm>SQLExceptions<indexterm>chaining of</indexterm></indexterm>
-<indexterm>Processing SQLExceptions</indexterm>
+<keywords><indexterm>SQLWarnings</indexterm><indexterm>SQLExceptions<indexterm>chaining
+of</indexterm></indexterm><indexterm>Processing SQLExceptions</indexterm>
</keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides the message, <i>SQLState</i> values,
-and error codes. Use the <codeph><i>getSQLState</i></codeph> and <codeph><i>getMessage</i></codeph> methods to view the <codeph><i>SQLState</i></codeph> and error messages. Use <codeph><i>getErrorCode</i></codeph> to see the error code. The error code defines the severity of
-the error and is not unique to each exception. The severity levels are described
-in<codeph><i>org.apache.derby.types.ExceptionSeverity</i></codeph>.</p>
-<p>Applications should also check for and process <i>java.sql.SQLWarnings</i>, which are processed in a similar way. <ph conref="devconrefs.dita#prod/productshortname"></ph> issues an <codeph><i>SQLWarning</i></codeph> if the <codeph><i>create=true</i></codeph> attribute is specified and the database already exists.</p>
-</conbody></concept>
+<p>Use the <codeph><i>getSQLState</i></codeph> and <codeph><i>getMessage</i></codeph> methods
+to view the <codeph><i>SQLState</i></codeph> and error messages. Use <codeph><i>getErrorCode</i></codeph> to
+see the error code. The error code defines the severity of the error and is
+not unique to each exception. The severity levels are described in<codeph><i>org.apache.derby.types.ExceptionSeverity</i></codeph>.</p>
+<p>Applications should also check for and process <i>java.sql.SQLWarnings</i>,
+which are processed in a similar way. <ph conref="devconrefs.dita#prod/productshortname"></ph> issues
+an <codeph><i>SQLWarning</i></codeph> if the <codeph><i>create=true</i></codeph> attribute
+is specified and the database already exists.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts89097.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts89097.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts89097.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts89097.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,16 +17,15 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts89097">
+<concept id="cdevconcepts89097" xml:lang="en-us">
<title>Lock wait timeouts</title>
-<prolog>
-</prolog>
+<shortdesc>Even if a transaction is not involved in a deadlock, it might have
+to wait a considerable amount of time to obtain a lock because of a long-running
+transaction or transactions holding locks on the tables it needs.</shortdesc>
+<prolog></prolog>
<conbody>
-<p>Even if a transaction is not involved in a deadlock, it might have to wait
-a considerable amount of time to obtain a lock because of a long-running transaction
-or transactions holding locks on the tables it needs. In such a situation,
-you might not want a transaction to wait indefinitely. Instead, you might
-want the waiting transaction to abort, or <i>time out</i>,
-after a reasonable amount of time, called a <i>lock wait timeout</i>. (For information about configuring the lock wait timeout, see <xref href="cdevconcepts16400.dita#cdevconcepts16400"/>.)</p>
-</conbody></concept>
+<p>In such a situation, you might not want a transaction to wait indefinitely.
+Instead, you might want the waiting transaction to abort, or <i>time out</i>,
+after a reasonable amount of time, called a <i>lock wait timeout</i>.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts89498.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts89498.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts89498.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts89498.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,49 +17,52 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts89498">
+<concept id="cdevconcepts89498" xml:lang="en-us">
<title>Pitfalls of sharing a connection among threads</title>
-<prolog>
-</prolog>
+<shortdesc>Here is a review of the potential pitfalls of sharing a single <i>Connection</i> among
+multiple threads.</shortdesc>
+<prolog></prolog>
<conbody>
-<p>Here is a review of the potential pitfalls of sharing a single <i>Connection</i> among multiple threads:</p>
<ul>
-<li>Committing or rolling back a transaction closes all open <i>ResultSet</i> objects and currently executing <i>Statements</i>, unless you are using held cursors.
-<p>If one thread commits, it closes
-the <i>Statements</i> and <i>ResultSets</i> of
+<li>Committing or rolling back a transaction closes all open <i>ResultSet</i> objects
+and currently executing <i>Statements</i>, unless you are using held cursors. <p>If
+one thread commits, it closes the <i>Statements</i> and <i>ResultSets</i> of
all other threads using the same connection.</p></li>
-<li>Executing a <i>Statement</i> automatically closes any
-existing open <i>ResultSet</i> generated by an earlier execution
-of that <i>Statement</i>.
-<p>If threads share <i>Statements</i>, one thread could close another's <i>ResultSet.</i></p></li>
+<li>Executing a <i>Statement</i> automatically closes any existing open <i>ResultSet</i> generated
+by an earlier execution of that <i>Statement</i>. <p>If threads share <i>Statements</i>,
+one thread could close another's <i>ResultSet.</i></p></li>
</ul>
-<p>In many cases, it is easier to assign each thread to a distinct <i>Connection</i>. If thread <i>A</i> does database work that
-is not transactionally related to thread <i>B</i>, assign
-them to different <i>Connections</i>. For example, if thread <i>A</i> is associated with a user input window that allows users
-to delete hotels and thread <i>B</i> is associated with a
-user window that allows users to view city information, assign those threads
-to different <i>Connections</i>. That way, when thread <i>A</i> commits, it does not affect any <i>ResultSets</i> or <i>Statements</i> of thread B.</p>
+<p>In many cases, it is easier to assign each thread to a distinct <i>Connection</i>.
+If thread <i>A</i> does database work that is not transactionally related
+to thread <i>B</i>, assign them to different <i>Connections</i>. For example,
+if thread <i>A</i> is associated with a user input window that allows users
+to delete hotels and thread <i>B</i> is associated with a user window that
+allows users to view city information, assign those threads to different <i>Connections</i>.
+That way, when thread <i>A</i> commits, it does not affect any <i>ResultSets</i> or <i>Statements</i> of
+thread B.</p>
<p>Another strategy is to have one thread do queries and another thread do
updates. Queries hold shared locks until the transaction commits in SERIALIZABLE
isolation mode; use READ_COMMITTED instead.</p>
<p>Yet another strategy is to have only one thread do database access. Have
other threads get information from the database access thread.</p>
-<p>Multiple threads are permitted to share a <i>Connection</i>, <i>Statement</i>, or <i>ResultSet</i>. However, the application programmer must ensure that one thread does
-not affect the behavior of the others.</p>
-<section><title>Recommended Practices</title>
-<p>Here are some tips for avoiding unexpected behavior:</p>
-<ul>
-<li>Avoid sharing <i>Statements</i> (and their <codeph><i>ResultSets</i></codeph>) among threads.</li>
-<li>Each time a thread executes a<i> Statement</i>, it should
-process the results before relinquishing the <codeph><i>Connection</i></codeph>.</li>
-<li>Each time a thread accesses the <i>Connection</i>, it
-should consistently commit or not, depending on application protocol.</li>
-<li>Have one thread be the "managing" database <i>Connection</i> thread that should handle the higher-level tasks, such as
-establishing the <codeph><i>Connection</i></codeph>, committing,
-rolling back, changing <codeph><i>Connection</i></codeph> properties
-such as auto-commit, closing the <codeph><i>Connection</i></codeph>,
-shutting down the database (in an embedded environment), and so on.</li>
-<li>Close <i>ResultSets</i> and <codeph><i>Statements</i></codeph> that are no longer needed in order to release resources.</li>
+<p>Multiple threads are permitted to share a <i>Connection</i>, <i>Statement</i>,
+or <i>ResultSet</i>. However, the application programmer must ensure that
+one thread does not affect the behavior of the others.</p>
+<section><title>Recommended Practices</title><p>Here are some tips for avoiding
+unexpected behavior:</p><ul>
+<li>Avoid sharing <i>Statements</i> (and their <codeph><i>ResultSets</i></codeph>)
+among threads.</li>
+<li>Each time a thread executes a<i> Statement</i>, it should process the
+results before relinquishing the <codeph><i>Connection</i></codeph>.</li>
+<li>Each time a thread accesses the <i>Connection</i>, it should consistently
+commit or not, depending on application protocol.</li>
+<li>Have one thread be the "managing" database <i>Connection</i> thread that
+should handle the higher-level tasks, such as establishing the <codeph><i>Connection</i></codeph>,
+committing, rolling back, changing <codeph><i>Connection</i></codeph> properties
+such as auto-commit, closing the <codeph><i>Connection</i></codeph>, shutting
+down the database (in an embedded environment), and so on.</li>
+<li>Close <i>ResultSets</i> and <codeph><i>Statements</i></codeph> that are
+no longer needed in order to release resources.</li>
</ul></section>
-</conbody></concept>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts95005.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevconcepts95005.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts95005.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts95005.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,30 +17,30 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts95005">
+<concept id="cdevconcepts95005" xml:lang="en-us">
<title>Deadlock detection</title>
+<shortdesc>When a transaction waits more than a specific amount of time to
+obtain a lock (called the deadlock timeout), <ph conref="devconrefs.dita#prod/productshortname"></ph> can
+detect whether the transaction is involved in a deadlock.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>Deadlock detection</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Deadlock detection</indexterm></keywords>
+</metadata></prolog>
<conbody>
-<p>When a transaction waits more than a specific amount of time to obtain
-a lock (called the deadlock timeout), <ph conref="devconrefs.dita#prod/productshortname"></ph> can detect whether the transaction
-is involved in a deadlock. When <ph conref="devconrefs.dita#prod/productshortname"></ph> analyzes such a situation for
-deadlocks it tries to determine how many transactions are involved in the
-deadlock (two or more). Usually aborting one transaction breaks the deadlock. <ph conref="devconrefs.dita#prod/productshortname"></ph> must
+<p>When <ph conref="devconrefs.dita#prod/productshortname"></ph> analyzes
+such a situation for deadlocks it tries to determine how many transactions
+are involved in the deadlock (two or more). Usually aborting one transaction
+breaks the deadlock. <ph conref="devconrefs.dita#prod/productshortname"></ph> must
pick one transaction as the victim and abort that transaction; it picks the
transaction that holds the fewest number of locks as the victim, on the assumption
that transaction has performed the least amount of work. (This may not be
the case, however; the transaction might have recently been escalated from
row-level locking to table locking and thus hold a small number of locks even
though it has done the most work.) </p>
-<p>When <ph conref="devconrefs.dita#prod/productshortname"></ph> aborts the victim transaction, it receives a deadlock
-error (an <i>SQLException</i> with an <codeph><i>SQLState</i></codeph> of 40001). The error message gives you the transaction
-IDs, the statements, and the status of locks involved in a deadlock situation.</p>
+<p>When <ph conref="devconrefs.dita#prod/productshortname"></ph> aborts the
+victim transaction, it receives a deadlock error (an <i>SQLException</i> with
+an <codeph><i>SQLState</i></codeph> of 40001). The error message gives you
+the transaction IDs, the statements, and the status of locks involved in a
+deadlock situation.</p>
<codeblock>ERROR 40001: A lock could not be obtained due to a deadlock,
cycle of locks & waiters is:
Lock : ROW, DEPARTMENT, (1,14)
@@ -46,8 +49,10 @@
Granted XID : {758, X} Lock : ROW, EMPLOYEE, (2,8)
Waiting XID : {758, U} , APP, update employee set bonus=150 where salary=23840
Granted XID : {752, X} The selected victim is XID : 752</codeblock>
-<p>For information on configuring when deadlock checking occurs, see <xref href="cdevconcepts16400.dita#cdevconcepts16400"/>.</p>
-<note>Deadlocks are detected only within a single database. Deadlocks
-across multiple databases are not detected. Non-database deadlocks caused
-by Java synchronization primitives are not detected by <ph conref="devconrefs.dita#prod/productshortname"></ph>.</note>
-</conbody></concept>
+<p>For information on configuring when deadlock checking occurs, see <xref
+href="cdevconcepts16400.dita#cdevconcepts16400"></xref>.</p>
+<note>Deadlocks are detected only within a single database. Deadlocks across
+multiple databases are not detected. Non-database deadlocks caused by Java
+synchronization primitives are not detected by <ph conref="devconrefs.dita#prod/productshortname"></ph>.</note>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevcsecure10983.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevcsecure10983.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure10983.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure10983.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,27 +17,27 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevcsecure10983">
+<concept id="cdevcsecure10983" xml:lang="en-us">
<title>Notes on the Derby security features</title>
+<shortdesc>Because <ph conref="devconrefs.dita#prod/productshortname"></ph> does
+not support traditional grant and revoke features, the security model has
+some basic limitations.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>Security features<indexterm>limitations of</indexterm></indexterm>
+<keywords><indexterm>Security features<indexterm>limitations of</indexterm></indexterm>
</keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
<conbody>
-<p>Because <ph conref="devconrefs.dita#prod/productshortname"></ph> does not support traditional grant and revoke features,
-the security model has some basic limitations. For both embedded and client/server
-systems, it assumes that users are trusted. You must trust your full-access
-users not to perform undesirable actions. You lock out non full-access users
-with database properties, which are stored in the database (and in an encrypted
-database these properties are also encrypted). Note, however, for a distributed/embedded
-system that a sophisticated user with the database encryption key might be
-able to physically change those properties in the database files.</p>
-<p>In addition, in the <ph conref="devconrefs.dita#prod/productshortname"></ph> system, it is not necessary to have a specific
-connection (or permission to access a particular database) to shut down the
-system. Any authenticated user can shut down the system.</p>
+<p>For both embedded and client/server systems, it assumes that users are
+trusted. You must trust your full-access users not to perform undesirable
+actions. You lock out non full-access users with database properties, which
+are stored in the database (and in an encrypted database these properties
+are also encrypted). Note, however, for a distributed/embedded system that
+a sophisticated user with the database encryption key might be able to physically
+change those properties in the database files.</p>
+<p>In addition, in the <ph conref="devconrefs.dita#prod/productshortname"></ph> system,
+it is not necessary to have a specific connection (or permission to access
+a particular database) to shut down the system. Any authenticated user can
+shut down the system.</p>
<p>Other security holes to think about are:</p>
<ul>
<li>JVM subversion, running the application under a home-grown JVM.</li>
@@ -42,4 +45,5 @@
<li>Class substitution, locating a class that has access to sensitive data
and replacing it with one that passes on information</li>
</ul>
-</conbody></concept>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevcsecure12392.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevcsecure12392.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure12392.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure12392.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,34 +17,33 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevcsecure12392">
+<concept id="cdevcsecure12392" xml:lang="en-us">
<title>Configuring security for your environment</title>
+<shortdesc>In most cases, you enable <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
+security features through the use of properties. It is important to understand
+the best way of setting properties for your environment.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>Security<indexterm>configuring</indexterm></indexterm>
+<keywords><indexterm>Security<indexterm>configuring</indexterm></indexterm>
</keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
<conbody>
-<p>In most cases, you enable <ph conref="devconrefs.dita#prod/productshortname"></ph>'s security features through the
-use of properties. It is important to understand the best way of setting properties
-for your environment.</p>
-<section><title>Configuring security</title>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> does not come with a built-in superuser. For that reason, be
-careful when configuring <ph conref="devconrefs.dita#prod/productshortname"></ph> for user authentication and user authorization. </p>
-<ol>
+<section><p><ph conref="devconrefs.dita#prod/productshortname"></ph> does
+not come with a built-in superuser. For that reason, be careful when configuring <ph
+conref="devconrefs.dita#prod/productshortname"></ph> for user authentication
+and user authorization. </p><ol>
<li>When first working with security, work with system-level properties only
so that you can easily override them if you make a mistake. </li>
<li>Be sure to create at least one valid user, and grant that user full (read-write)
-access. For example, you might always want to create a user called <i>sa</i> with the password <i><ph conref="devconrefs.dita#prod/productlowercase"></ph></i> while
+access. For example, you might always want to create a user called <i>sa</i> with
+the password <i><ph conref="devconrefs.dita#prod/productlowercase"></ph></i> while
you are developing. </li>
<li>Test the authentication system while it is still configured at the system
level. Be absolutely certain that you have configured the system correctly
before setting the properties as database-level properties.</li>
-<li>Before disabling system-level properties (by setting <i>derby.database.propertiesOnly</i> to true), test that at least one database-level read-write user (such
-as <i>sa</i>) is valid. If you do not have at least one valid
-user that the system can authenticate, you will not be able to access your
-database.</li>
+<li>Before disabling system-level properties (by setting <i>derby.database.propertiesOnly</i> to
+true), test that at least one database-level read-write user (such as <i>sa</i>)
+is valid. If you do not have at least one valid user that the system can authenticate,
+you will not be able to access your database.</li>
</ol></section>
-</conbody></concept>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevcsecure21547.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevcsecure21547.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure21547.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure21547.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,29 +17,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevcsecure21547">
+<concept id="cdevcsecure21547" xml:lang="en-us">
<title>Built-in Derby users</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> provides
+a simple, built-in repository of user names and passwords.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>Users<indexterm>Derby's built-in repository</indexterm></indexterm>
-<indexterm>Passwords</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Users<indexterm>Derby's built-in repository</indexterm></indexterm>
+<indexterm>Passwords</indexterm></keywords>
+</metadata></prolog>
<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides a simple, built-in repository of user names and passwords. </p>
-<p>To use the built-in repository, set <i>derby.authentication.provider</i> to <i>BUILTIN</i>. Using built-in users is an alternative
-to using an external directory service such as LDAP.</p>
+<p>To use the built-in repository, set <i>derby.authentication.provider</i> to <i>BUILTIN</i>.
+Using built-in users is an alternative to using an external directory service
+such as LDAP.</p>
<codeblock>derby.authentication.provider=BUILTIN</codeblock>
-<p>You can create user names and passwords for <ph conref="devconrefs.dita#prod/productshortname"></ph> users by specifying
-them with the <i>derby.user.UserName</i> property.</p>
-<note>These user names are case-sensitive for user authorization.
-User names are <i>SQL92Identifiers</i>. Delimited identifiers
-are allowed:
-<codeblock>derby.user."FRed"=java</codeblock></note>
-<p>For more information on user names and <i>SQL92Identifiers</i>, see <xref href="cdevcsecure37241.dita#cdevcsecure37241"/>.</p>
-<note>For passwords, it is a good idea not to use words that would
-be easily guessed, such as a login name or simple words or numbers. A password
-should be a mix of numbers and upper- and lowercase letters.</note>
-</conbody></concept>
+<p>You can create user names and passwords for <ph conref="devconrefs.dita#prod/productshortname"></ph> users
+by specifying them with the <i>derby.user.UserName</i> property.</p>
+<note>These user names are case-sensitive for user authorization. User names
+are <i>SQL92Identifiers</i>. Delimited identifiers are allowed: <codeblock>derby.user."FRed"=java</codeblock></note>
+<note>For passwords, it is a good idea not to use words that would be easily
+guessed, such as a login name or simple words or numbers. A password should
+be a mix of numbers and upper- and lowercase letters.</note>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevcsecure21561.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevcsecure21561.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure21561.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure21561.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,23 +17,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevcsecure21561">
+<concept id="cdevcsecure21561" xml:lang="en-us">
<title>User-defined class</title>
+<shortdesc>Set <i>derby.authentication.provider</i> to the full name of a
+class that implements the public interface <i>org.apache.derby.authentication.UserAuthenticator</i>.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>User authorization<indexterm>providing your own</indexterm></indexterm>
+<keywords><indexterm>User authorization<indexterm>providing your own</indexterm></indexterm>
</keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
<conbody>
-<p>Set <i>derby.authentication.provider</i> to the full name
-of a class that implements the public interface <i>org.apache.derby.authentication.UserAuthenticator</i>.</p>
<p>By writing your own class that fulfills some minimal requirements, you
-can hook <ph conref="devconrefs.dita#prod/productshortname"></ph> up to an <i>external authentication service</i> other than LDAP. To do so, specify an external authentication
-service by setting the property <codeph><i>derby.authentication.provider</i></codeph> to a class name that you want <ph conref="devconrefs.dita#prod/productshortname"></ph> to load at startup.</p>
+can hook <ph conref="devconrefs.dita#prod/productshortname"></ph> up to an <i>external
+authentication service</i> other than LDAP. To do so, specify an external
+authentication service by setting the property <codeph><i>derby.authentication.provider</i></codeph> to
+a class name that you want <ph conref="devconrefs.dita#prod/productshortname"></ph> to
+load at startup.</p>
<p>The class that provides the external authentication service must implement
-the public interface <i>org.apache.derby.authentication</i>.<i>UserAuthenticator</i> and throw exceptions of the type <i>java.sql.SQLException</i> where appropriate.</p>
-<p>Using a user-defined class makes <ph conref="devconrefs.dita#prod/productshortname"></ph> adaptable to various naming
-and directory services.</p>
-</conbody></concept>
+the public interface <i>org.apache.derby.authentication</i>.<i>UserAuthenticator</i> and
+throw exceptions of the type <i>java.sql.SQLException</i> where appropriate.</p>
+<p>Using a user-defined class makes <ph conref="devconrefs.dita#prod/productshortname"></ph> adaptable
+to various naming and directory services.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevcsecure24458.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevcsecure24458.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure24458.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure24458.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,54 +17,54 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevcsecure24458">
+<concept id="cdevcsecure24458" xml:lang="en-us">
<title>Authorization identifiers, user authentication, and user authorization</title>
+<shortdesc>When working with both user authentication and user authorization,
+you need to understand how user names are treated by each system.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>Users<indexterm>and schemas</indexterm></indexterm>
-<indexterm>Schemas<indexterm>and users</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Users<indexterm>and schemas</indexterm></indexterm><indexterm>Schemas<indexterm>and
+users</indexterm></indexterm></keywords>
+</metadata></prolog>
<conbody>
-<p>When working with both user authentication and user authorization, you
-need to understand how user names are treated by each system. If an external
-authentication system is used, the conversion of the user's name to an
-authorization identifier does not happen until <i>after</i> authentication
-has occurred but <i>before</i> user authorization (see <xref href="cdevcsecure36595.dita#cdevcsecure36595"/>). Imagine, for example, a user named
-Fred.</p>
+<p>If an external authentication system is used, the conversion of the user's
+name to an authorization identifier does not happen until <i>after</i> authentication
+has occurred but <i>before</i> user authorization. Imagine, for example, a
+user named Fred.</p>
<ul>
-<li>Within the user authentication system, Fred is known as <i>FRed</i>. Your external user authorization service is case-sensitive, so
-Fred must always type his name that way.
-<codeblock>Connection conn = DriverManager.getConnection(
+<li>Within the user authentication system, Fred is known as <i>FRed</i>. Your
+external user authorization service is case-sensitive, so Fred must always
+type his name that way. <codeblock>Connection conn = DriverManager.getConnection(
"jdbc:derby:myDB", "FRed", "flintstone");</codeblock></li>
-<li>Within the <ph conref="devconrefs.dita#prod/productshortname"></ph> user authorization system, Fred becomes a case-insensitive
-authorization identifier. Fred is known as <i>FRED</i>.</li>
+<li>Within the <ph conref="devconrefs.dita#prod/productshortname"></ph> user
+authorization system, Fred becomes a case-insensitive authorization identifier.
+Fred is known as <i>FRED</i>.</li>
<li>When specifying which users are authorized to access the accounting database,
-you must list Fred's authorization identifier, <i>FRED</i> (which you can type as <i>FRED</i>, <i>FREd</i>, or <i>fred</i>, since the system automatically
-converts it to all-uppercase).
-<codeblock><b>derby.fullAccessUsers=sa,FRED,mary</b></codeblock></li>
+you must list Fred's authorization identifier, <i>FRED</i> (which you can
+type as <i>FRED</i>, <i>FREd</i>, or <i>fred</i>, since the system automatically
+converts it to all-uppercase). <codeblock><b>derby.fullAccessUsers=sa,FRED,mary</b></codeblock></li>
</ul>
-<p>Let's take a second example, where Fred has a slightly different name
-within the user authentication system.</p>
+<p>Let's take a second example, where Fred has a slightly different name within
+the user authentication system.</p>
<ul>
-<li>Within the user authentication system, Fred is known as <i>Fred!</i>. You must now put double quotes around the name, because it is
-not a valid <codeph><i>SQL92Identifier</i></codeph>. (<ph conref="devconrefs.dita#prod/productshortname"></ph> knows
-to remove the double quotes when passing the name to the external authentication
-system.)
-<codeblock>Connection conn = DriverManager.getConnection(
+<li>Within the user authentication system, Fred is known as <i>Fred!</i>.
+You must now put double quotes around the name, because it is not a valid <codeph><i>SQL92Identifier</i></codeph>.
+(<ph conref="devconrefs.dita#prod/productshortname"></ph> knows to remove
+the double quotes when passing the name to the external authentication system.)
+ <codeblock>Connection conn = DriverManager.getConnection(
"jdbc:derby:myDB", "\"Fred!\"", "flintstone");</codeblock></li>
-<li>Within the <ph conref="devconrefs.dita#prod/productshortname"></ph> user authorization system, <i>Fred</i> becomes a case-sensitive authorization identifier. Fred is known
-as <i>Fred!</i>.</li>
+<li>Within the <ph conref="devconrefs.dita#prod/productshortname"></ph> user
+authorization system, <i>Fred</i> becomes a case-sensitive authorization identifier.
+Fred is known as <i>Fred!</i>.</li>
<li>When specifying which users are authorized to access the accounting database,
-you must list Fred's authorization identifier, <i>"Fred!"</i> (which you must always delimit with double quotation marks).
-<codeblock>derby.fullAccessUsers=sa,"Fred!",manager</codeblock></li>
+you must list Fred's authorization identifier, <i>"Fred!"</i> (which you must
+always delimit with double quotation marks). <codeblock>derby.fullAccessUsers=sa,"Fred!",manager</codeblock></li>
</ul>
<p>As shown in the first example, your external authentication system may
be case-sensitive, whereas the authorization identifier within <ph conref="devconrefs.dita#prod/productshortname"></ph> may
not be. If your authentication system allows two distinct users whose names
differ by case, delimit all user names within the connection request to make
-all user names case-sensitive within the <ph conref="devconrefs.dita#prod/productshortname"></ph> system. In addition,
-you must also delimit user names that do not conform to <i>SQL92Identifier</i> rules with double quotes.</p>
-</conbody></concept>
+all user names case-sensitive within the <ph conref="devconrefs.dita#prod/productshortname"></ph> system.
+In addition, you must also delimit user names that do not conform to <i>SQL92Identifier</i> rules
+with double quotes.</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevcsecure31493.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevcsecure31493.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure31493.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure31493.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,18 +17,15 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevcsecure31493">
+<concept id="cdevcsecure31493" xml:lang="en-us">
<title>Specifying an alternate encryption provider</title>
+<shortdesc>You can specify an alternate provider when you create the database
+with the <codeph><i>encryptionProvider=providerName</i></codeph> attribute.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>Encryption providers<indexterm>configuring</indexterm></indexterm>
+<keywords><indexterm>Encryption providers<indexterm>configuring</indexterm></indexterm>
</keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
<conbody>
-<p>You can specify an alternate provider when you create the database with
-the <codeph><i>encryptionProvider=providerName</i></codeph> attribute. </p>
<p>You must specify the full package and class name of the provider, and you
must also add the libraries to the application's classpath.</p>
<codeblock><b>-- using the the provider library jce_jdk13-10b4.zip|
@@ -42,4 +42,5 @@
bootPassword=clo760uds2caPe;
encryptionProvider=iaik.security.provider.IAIK;encryptionAlgorithm=
DES/CBC/NoPadding</codeblock>
-</conbody></concept>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevcsecure36127.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevcsecure36127.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure36127.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure36127.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,25 +17,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevcsecure36127">
+<concept id="cdevcsecure36127" xml:lang="en-us">
<title>Enabling user authentication</title>
+<shortdesc>To enable user authentication, set the <i>derby.connection.requireAuthentication</i> property
+to true. Otherwise, <ph conref="devconrefs.dita#prod/productshortname"></ph> does
+not require a user name and password. You can set this property as a system-wide
+property or as a database-wide property.</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>User authentication<indexterm>enabling</indexterm></indexterm>
+<keywords><indexterm>User authentication<indexterm>enabling</indexterm></indexterm>
</keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
<conbody>
-<p>To enable user authentication, set the <i>derby.connection.requireAuthentication</i> property to true. Otherwise, <ph conref="devconrefs.dita#prod/productshortname"></ph> does not require a user name
-and password. You can set this property as a system-wide property or as a
-database-wide property.</p>
<p>For a multi-user product, you would typically set it for the system in
-the <i>derby.properties</i> file for your server, since it
-is in a trusted environment.</p>
-<note>If you start a <ph conref="devconrefs.dita#prod/productshortname"></ph> system with user authentication
-enabled but without defining at least one user, you will not be able to shut
-down the system gracefully. When <ph conref="devconrefs.dita#prod/productshortname"></ph> is running in a connectivity
-server and user authentication is turned on, stopping the server requires
-a user name and password. You will need to alter shutdown scripts accordingly. </note>
-</conbody></concept>
+the <i>derby.properties</i> file for your server, since it is in a trusted
+environment.</p>
+<note>If you start a <ph conref="devconrefs.dita#prod/productshortname"></ph> system
+with user authentication enabled but without defining at least one user, you
+will not be able to shut down the system gracefully. When <ph conref="devconrefs.dita#prod/productshortname"></ph> is
+running in a connectivity server and user authentication is turned on, stopping
+the server requires a user name and password. You will need to alter shutdown
+scripts accordingly. </note>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevcsecure36595.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevcsecure36595.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure36595.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure36595.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,20 +17,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevcsecure36595">
+<concept id="cdevcsecure36595" xml:lang="en-us">
<title>User authorization</title>
+<shortdesc><ph conref="devconrefs.dita#prod/productshortname"></ph> provides
+user authorization, which is a means of granting users permission to access
+a database (or system).</shortdesc>
<prolog><metadata>
-<keywords>
-<indexterm>User authorization</indexterm>
-<indexterm>Authorization</indexterm>
+<keywords><indexterm>User authorization</indexterm><indexterm>Authorization</indexterm>
</keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
<conbody>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides user authorization, which is a means of granting users
-permission to access a database (or system). <ph conref="devconrefs.dita#prod/productshortname"></ph> allows you to distinguish
-between full (read-write) access and read-only access. (<ph conref="devconrefs.dita#prod/productshortname"></ph> Version 10.1 does
-not support the SQL GRANT and REVOKE features, which allow you to set permissions
-to specific database objects or specific SQL actions.)</p>
-</conbody></concept>
+<p><ph conref="devconrefs.dita#prod/productshortname"></ph> allows you to
+distinguish between full (read-write) access and read-only access. (<ph conref="devconrefs.dita#prod/productshortname"></ph> Version
+10.1 does not support the SQL GRANT and REVOKE features, which allow you to
+set permissions to specific database objects or specific SQL actions.)</p>
+</conbody>
+</concept>
Modified: db/derby/docs/trunk/src/devguide/cdevcsecure37241.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/cdevcsecure37241.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure37241.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure37241.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
<!--
Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -14,20 +17,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
<concept id="cdevcsecure37241" xml:lang="en-us">
<title>Users and authorization identifiers</title>
+<shortdesc>User names within the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
+are known as <i>authorization identifiers</i>. The authorization identifier
+is a string that represents the name of the user, if one was provided in the
+connection request.</shortdesc>
<prolog><metadata>
<keywords><indexterm>Authorization identifiers</indexterm></keywords>
</metadata></prolog>
<conbody>
-<p>User names within the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
-are known as <i>authorization identifiers</i>. The authorization identifier
-is a string that represents the name of the user, if one was provided in the
-connection request. For example, the built-in function CURRENT_USER returns
-the authorization identifier for the current user.</p>
+<p>For example, the built-in function CURRENT_USER returns the authorization
+identifier for the current user.</p>
<p>Once the authorization identifier is passed to the <ph conref="devconrefs.dita#prod/productshortname"></ph> system,
it becomes an <i>SQL92Identifier</i>. <codeph><i>SQL92Identifiers</i></codeph>-the
kind of identifiers that represent database objects such as tables and columns-are
@@ -35,8 +36,6 @@
quotes, are limited to 128 characters, and have other limitations.</p>
<p>User names must be valid authorization identifiers even if user authentication
is turned off, and even if all users are allowed access to all databases.</p>
-<p>For more information about <i>SQL92Identifiers</i>, see the <cite><ph
-conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
+<p>For more information about <i>SQL92Identifiers</i>, see the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
</conbody>
</concept>
-