db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r159548 [5/17] - in incubator/derby/docs/trunk/src: adminguide/ devguide/ getstart/ tuning/
Date Thu, 31 Mar 2005 00:27:28 GMT
Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts29416.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts29416.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts29416.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts29416.dita Wed Mar 30 16:26:36 2005
@@ -1,108 +1,108 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-<concept id="cdevconcepts29416" xml:lang="en-us">
-<title>Using auto-commit</title>
-<prolog><metadata>
-<keywords><indexterm>Auto-commit<indexterm>using</indexterm></indexterm></keywords>
-</metadata></prolog>
-<conbody>
-<p>A new connection to a <ph conref="devconrefs.dita#prod/productshortname"></ph> database
-is in auto-commit mode by default, as specified by the JDBC standard. Auto-commit
-mode means that when a statement is completed, the method <i>commit</i> is
-called on that statement automatically. Auto-commit in effect makes every
-SQL statement a transaction. The commit occurs when the statement completes
-or the next statement is executed, whichever comes first. In the case of a
-statement returning a <codeph><i>ResultSet</i></codeph>, the statement completes
-when the last row of the <codeph><i>ResultSet</i></codeph> has been retrieved
-or the <codeph><i>ResultSet</i></codeph> has been closed explicitly.</p>
-<p>Some applications might prefer to work with <ph conref="devconrefs.dita#prod/productshortname"></ph> in
-auto-commit mode; some might prefer to work with auto-commit turned off. You
-should be aware of the implications of using either model.</p>
-<p>You should be aware of the following when you use auto-commit:</p>
-<ul>
-<li><i>Cursors</i>   <p>You cannot use auto-commit if you do any positioned
-updates or deletes (that is, an update or delete statement with a "WHERE CURRENT
-OF" clause) on cursors which have the <i>close cursors on commit</i> option
-set.</p><p>Auto-commit automatically closes cursors, which are explicitly
-opened with the <i>close on commit</i> option, when you do any in-place updates
-or deletes. For more information about cursors, see <xref href="cdevconcepts41275.dita#cdevconcepts41275"></xref>.</p><p>A
-cursor declared to be held across commit can execute updates and issue multiple
-commits before closing the cursor, but the cursor must be repositioned before
-any statement following the commit. If this is attempted with auto-commit
-on, an error is generated. </p></li>
-<li><i>Database-side JDBC Procedures (procedures using nested connections)</i> 
- <p>You cannot execute procedures within SQL statements if those procedures
-perform a commit or rollback on the current connection. Since in the auto-commit
-mode all SQL statements are implicitly committed, <ph conref="devconrefs.dita#prod/productshortname"></ph> turns
-off auto-commit during execution of database-side procedures and turns it
-back on when the method completes.</p><p>Procedures that use nested connections
-are not permitted to turn auto-commit on or off or to commit or roll back.</p></li>
-<li><i>Table-level locking and the SERIALIZABLE isolation level</i>   <p>When
-an application uses table-level locking and the SERIALIZABLE isolation level,
-all statements that access tables hold at least shared table locks. Shared
-locks prevent other transactions that update data from accessing the table.
-A transaction holds a lock on a table until the transaction commits. <i>So
-even a SELECT statement holds a shared lock on a table until its connection
-commits and a new transaction begins. </i></p><?Pub Caret?><table frame="all">
-<title>Summary of Application Behavior with Auto-Commit On or Off</title>
-<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="46*"/>
-<colspec colname="2" colnum="2" colwidth="24*"/><colspec colname="3" colnum="3"
-colwidth="25*"/>
-<thead>
-<row>
-<entry align="left" colname="1" valign="bottom">Topic</entry>
-<entry align="left" colname="2" valign="bottom">Auto-Commit On</entry>
-<entry align="left" colname="3" valign="bottom">Auto-Commit Off</entry>
-</row>
-</thead>
-<tbody>
-<row>
-<entry colname="1">Transactions</entry>
-<entry colname="2">Each statement is a separate transaction.</entry>
-<entry colname="3">Commit() or rollback() begins a transaction.</entry>
-</row>
-<row>
-<entry colname="1">Database-side JDBC procedures (routines using nested connections)</entry>
-<entry colname="2">Auto-commit is turned off.</entry>
-<entry colname="3">Works (no explicit commits or rollbacks are allowed).</entry>
-</row>
-<row>
-<entry colname="1">Updatable cursors</entry>
-<entry colname="2">Does not work.</entry>
-<entry colname="3">Works.</entry>
-</row>
-<row>
-<entry colname="1">Multiple connections accessing the same data</entry>
-<entry colname="2">Works.</entry>
-<entry colname="3">Works. Lower concurrency when applications use SERIALIZABLE
-isolation mode and table-level locking.</entry>
-</row>
-<row>
-<entry colname="1">Updatable ResultSets</entry>
-<entry colname="2">Works.</entry>
-<entry colname="3">Works. Not required by the JDBC program.</entry>
-</row>
-</tbody>
-</tgroup>
-</table></li>
-</ul>
-</conbody>
-</concept>
-<?Pub *0000005510?>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<concept id="cdevconcepts29416" xml:lang="en-us">
+<title>Using auto-commit</title>
+<prolog><metadata>
+<keywords><indexterm>Auto-commit<indexterm>using</indexterm></indexterm></keywords>
+</metadata></prolog>
+<conbody>
+<p>A new connection to a <ph conref="devconrefs.dita#prod/productshortname"></ph> database
+is in auto-commit mode by default, as specified by the JDBC standard. Auto-commit
+mode means that when a statement is completed, the method <i>commit</i> is
+called on that statement automatically. Auto-commit in effect makes every
+SQL statement a transaction. The commit occurs when the statement completes
+or the next statement is executed, whichever comes first. In the case of a
+statement returning a <codeph><i>ResultSet</i></codeph>, the statement completes
+when the last row of the <codeph><i>ResultSet</i></codeph> has been retrieved
+or the <codeph><i>ResultSet</i></codeph> has been closed explicitly.</p>
+<p>Some applications might prefer to work with <ph conref="devconrefs.dita#prod/productshortname"></ph> in
+auto-commit mode; some might prefer to work with auto-commit turned off. You
+should be aware of the implications of using either model.</p>
+<p>You should be aware of the following when you use auto-commit:</p>
+<ul>
+<li><i>Cursors</i>   <p>You cannot use auto-commit if you do any positioned
+updates or deletes (that is, an update or delete statement with a "WHERE CURRENT
+OF" clause) on cursors which have the <i>close cursors on commit</i> option
+set.</p><p>Auto-commit automatically closes cursors, which are explicitly
+opened with the <i>close on commit</i> option, when you do any in-place updates
+or deletes. For more information about cursors, see <xref href="cdevconcepts41275.dita#cdevconcepts41275"></xref>.</p><p>A
+cursor declared to be held across commit can execute updates and issue multiple
+commits before closing the cursor, but the cursor must be repositioned before
+any statement following the commit. If this is attempted with auto-commit
+on, an error is generated. </p></li>
+<li><i>Database-side JDBC Procedures (procedures using nested connections)</i> 
+ <p>You cannot execute procedures within SQL statements if those procedures
+perform a commit or rollback on the current connection. Since in the auto-commit
+mode all SQL statements are implicitly committed, <ph conref="devconrefs.dita#prod/productshortname"></ph> turns
+off auto-commit during execution of database-side procedures and turns it
+back on when the method completes.</p><p>Procedures that use nested connections
+are not permitted to turn auto-commit on or off or to commit or roll back.</p></li>
+<li><i>Table-level locking and the SERIALIZABLE isolation level</i>   <p>When
+an application uses table-level locking and the SERIALIZABLE isolation level,
+all statements that access tables hold at least shared table locks. Shared
+locks prevent other transactions that update data from accessing the table.
+A transaction holds a lock on a table until the transaction commits. <i>So
+even a SELECT statement holds a shared lock on a table until its connection
+commits and a new transaction begins. </i></p><?Pub Caret?><table frame="all">
+<title>Summary of Application Behavior with Auto-Commit On or Off</title>
+<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="46*"/>
+<colspec colname="2" colnum="2" colwidth="24*"/><colspec colname="3" colnum="3"
+colwidth="25*"/>
+<thead>
+<row>
+<entry align="left" colname="1" valign="bottom">Topic</entry>
+<entry align="left" colname="2" valign="bottom">Auto-Commit On</entry>
+<entry align="left" colname="3" valign="bottom">Auto-Commit Off</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="1">Transactions</entry>
+<entry colname="2">Each statement is a separate transaction.</entry>
+<entry colname="3">Commit() or rollback() begins a transaction.</entry>
+</row>
+<row>
+<entry colname="1">Database-side JDBC procedures (routines using nested connections)</entry>
+<entry colname="2">Auto-commit is turned off.</entry>
+<entry colname="3">Works (no explicit commits or rollbacks are allowed).</entry>
+</row>
+<row>
+<entry colname="1">Updatable cursors</entry>
+<entry colname="2">Does not work.</entry>
+<entry colname="3">Works.</entry>
+</row>
+<row>
+<entry colname="1">Multiple connections accessing the same data</entry>
+<entry colname="2">Works.</entry>
+<entry colname="3">Works. Lower concurrency when applications use SERIALIZABLE
+isolation mode and table-level locking.</entry>
+</row>
+<row>
+<entry colname="1">Updatable ResultSets</entry>
+<entry colname="2">Works.</entry>
+<entry colname="3">Works. Not required by the JDBC program.</entry>
+</row>
+</tbody>
+</tgroup>
+</table></li>
+</ul>
+</conbody>
+</concept>
+<?Pub *0000005510?>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts29416.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts30291.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts30291.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts30291.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts30291.dita Wed Mar 30 16:26:36 2005
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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="cdevconcepts30291">
-<title>Locking, concurrency, and isolation</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Transaction isolation levels</indexterm>
-<indexterm>Isolation levels</indexterm>
-<indexterm>Locking</indexterm>
-<indexterm>Concurrency</indexterm>
-</keywords>
-</metadata>
-</prolog>
-<conbody>
-<p>This section discusses topics pertinent to multi-user systems, in which
-concurrency is important. <ph conref="devconrefs.dita#prod/productshortname"></ph> is configured by default to work well
-for multi-user systems. For single-user systems, you might want to tune your
-system so that it uses fewer resources; see <xref href="cdevconcepts23810.dita#cdevconcepts23810"/>.</p>
-<ul>
-<li><xref href="cdevconcepts15366.dita#cdevconcepts15366"/></li>
-<li><xref href="cdevconcepts22300.dita#cdevconcepts22300"/></li>
-<li><xref href="cdevconcepts23810.dita#cdevconcepts23810"/></li>
-<li><xref href="cdevconcepts36402.dita#cdevconcepts36402"/></li>
-<li><xref href="cdevconcepts28436.dita#cdevconcepts28436"/></li>
-</ul>
-</conbody></concept>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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="cdevconcepts30291">
+<title>Locking, concurrency, and isolation</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Transaction isolation levels</indexterm>
+<indexterm>Isolation levels</indexterm>
+<indexterm>Locking</indexterm>
+<indexterm>Concurrency</indexterm>
+</keywords>
+</metadata>
+</prolog>
+<conbody>
+<p>This section discusses topics pertinent to multi-user systems, in which
+concurrency is important. <ph conref="devconrefs.dita#prod/productshortname"></ph> is configured by default to work well
+for multi-user systems. For single-user systems, you might want to tune your
+system so that it uses fewer resources; see <xref href="cdevconcepts23810.dita#cdevconcepts23810"/>.</p>
+<ul>
+<li><xref href="cdevconcepts15366.dita#cdevconcepts15366"/></li>
+<li><xref href="cdevconcepts22300.dita#cdevconcepts22300"/></li>
+<li><xref href="cdevconcepts23810.dita#cdevconcepts23810"/></li>
+<li><xref href="cdevconcepts36402.dita#cdevconcepts36402"/></li>
+<li><xref href="cdevconcepts28436.dita#cdevconcepts28436"/></li>
+</ul>
+</conbody></concept>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts30291.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts30811.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts30811.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts30811.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts30811.dita Wed Mar 30 16:26:36 2005
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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="cdevconcepts30811" xml:lang="en-us">
-<title>Requirements for updatable cursors</title>
-<prolog><metadata>
-<keywords><indexterm>Cursors<indexterm>requirements for being updatable</indexterm></indexterm>
-<indexterm>Cursors<indexterm>updatable</indexterm></indexterm></keywords>
-</metadata></prolog>
-<conbody>
-<p>Only specific SELECT statements-<?Pub Caret?> simple accesses of a single
-table-allow you to update or delete rows as you step through them.</p>
-<p>For more information, see "SELECT statement" and "FOR UPDATE clause" in
-the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
-</conbody>
-</concept>
-<?Pub *0000000813?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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="cdevconcepts30811" xml:lang="en-us">
+<title>Requirements for updatable cursors</title>
+<prolog><metadata>
+<keywords><indexterm>Cursors<indexterm>requirements for being updatable</indexterm></indexterm>
+<indexterm>Cursors<indexterm>updatable</indexterm></indexterm></keywords>
+</metadata></prolog>
+<conbody>
+<p>Only specific SELECT statements-<?Pub Caret?> simple accesses of a single
+table-allow you to update or delete rows as you step through them.</p>
+<p>For more information, see "SELECT statement" and "FOR UPDATE clause" in
+the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p>
+</conbody>
+</concept>
+<?Pub *0000000813?>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts30811.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts32861.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts32861.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts32861.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts32861.dita Wed Mar 30 16:26:36 2005
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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="cdevconcepts32861">
-<title>Programming applications to handle deadlocks</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Deadlocks<indexterm>programming an application to
-handle</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
-<conbody>
-<p>When you configure your system for deadlock and lockwait timeouts and an
-application could be chosen as a victim when the transaction times out, you
-should program your application to handle this. To do this, test for <i>SQLExceptions</i> with <codeph><i>SQLStates</i></codeph> of 40001
-(deadlock timeout) or 40XL1 or 40XL2 (lockwait timeout).</p>
-<p>In the case of a deadlock you might want to re-try the transaction that
-was chosen as a victim. In the case of a lock wait timeout, you probably do
-not want to do this right away.</p>
-<p>The following code is one example of how to handle a deadlock timeout.</p>
-<codeblock><b>/// if this code might encounter a deadlock, 
-// put the whole thing in a try/catch block
-// then try again if the deadlock victim exception 
-// was thrown</b>
-try {
-    s6.executeUpdate(
-         "UPDATE employee " + 
-         "SET bonus = 625 " + 91 
-         "WHERE empno='000150'");  
-    s6.executeUpdate("UPDATE project " + 
-         "SET respemp = '000150' " + 
-         "WHERE projno='IF1000'"); 
-} 
-<b>// note: do not catch such exceptions in database-side methods; 
-// catch such exceptions only at the outermost level of 
-// application code. 
-// See <xref href="cdevspecial41728.dita#cdevspecial41728"/>. </b> 
-catch (SQLException se) { 
-    if (se.getSQLState().equals("40001")) { 
-        <b>// it was chosen as a victim of a deadlock. 
-        // try again at least once at this point.</b> 
-        System.out.println( "Will try the transaction again."); 
-        s6.executeUpdate("UPDATE employee " + 
-        "SET bonus = 625 " + 
-        "WHERE empno='000150'"); 
-        s6.executeUpdate("UPDATE project " + 
-        "SET respemp = 000150 " + 
-        "WHERE projno='IF1000'"); 
-    } 
-    else throw se; 
-}
-</codeblock>
-</conbody></concept>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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="cdevconcepts32861">
+<title>Programming applications to handle deadlocks</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Deadlocks<indexterm>programming an application to
+handle</indexterm></indexterm>
+</keywords>
+</metadata>
+</prolog>
+<conbody>
+<p>When you configure your system for deadlock and lockwait timeouts and an
+application could be chosen as a victim when the transaction times out, you
+should program your application to handle this. To do this, test for <i>SQLExceptions</i> with <codeph><i>SQLStates</i></codeph> of 40001
+(deadlock timeout) or 40XL1 or 40XL2 (lockwait timeout).</p>
+<p>In the case of a deadlock you might want to re-try the transaction that
+was chosen as a victim. In the case of a lock wait timeout, you probably do
+not want to do this right away.</p>
+<p>The following code is one example of how to handle a deadlock timeout.</p>
+<codeblock><b>/// if this code might encounter a deadlock, 
+// put the whole thing in a try/catch block
+// then try again if the deadlock victim exception 
+// was thrown</b>
+try {
+    s6.executeUpdate(
+         "UPDATE employee " + 
+         "SET bonus = 625 " + 91 
+         "WHERE empno='000150'");  
+    s6.executeUpdate("UPDATE project " + 
+         "SET respemp = '000150' " + 
+         "WHERE projno='IF1000'"); 
+} 
+<b>// note: do not catch such exceptions in database-side methods; 
+// catch such exceptions only at the outermost level of 
+// application code. 
+// See <xref href="cdevspecial41728.dita#cdevspecial41728"/>. </b> 
+catch (SQLException se) { 
+    if (se.getSQLState().equals("40001")) { 
+        <b>// it was chosen as a victim of a deadlock. 
+        // try again at least once at this point.</b> 
+        System.out.println( "Will try the transaction again."); 
+        s6.executeUpdate("UPDATE employee " + 
+        "SET bonus = 625 " + 
+        "WHERE empno='000150'"); 
+        s6.executeUpdate("UPDATE project " + 
+        "SET respemp = 000150 " + 
+        "WHERE projno='IF1000'"); 
+    } 
+    else throw se; 
+}
+</codeblock>
+</conbody></concept>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts32861.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts34828.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts34828.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts34828.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts34828.dita Wed Mar 30 16:26:36 2005
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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="cdevconcepts34828">
-<title>Working with multiple connections to a single database</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Multiple connections<indexterm>in single application</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
-<conbody>
-<ul>
-<li><xref href="rdevconcepts713.dita#rdevconcepts713"/></li>
-<li><xref href="cdevconcepts10914.dita#cdevconcepts10914"/></li>
-<li><xref href="cdevconcepts24019.dita#cdevconcepts24019"/></li>
-</ul>
-</conbody></concept>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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="cdevconcepts34828">
+<title>Working with multiple connections to a single database</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Multiple connections<indexterm>in single application</indexterm></indexterm>
+</keywords>
+</metadata>
+</prolog>
+<conbody>
+<ul>
+<li><xref href="rdevconcepts713.dita#rdevconcepts713"/></li>
+<li><xref href="cdevconcepts10914.dita#cdevconcepts10914"/></li>
+<li><xref href="cdevconcepts24019.dita#cdevconcepts24019"/></li>
+</ul>
+</conbody></concept>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts34828.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts36402.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts36402.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts36402.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts36402.dita Wed Mar 30 16:26:36 2005
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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="cdevconcepts36402">
-<title>Types and scope of locks in Derby systems</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Locks<indexterm>exclusive</indexterm><indexterm>shared</indexterm><indexterm>update</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
-<conbody>
-<p>There are several types of locks available in <ph conref="devconrefs.dita#prod/productshortname"></ph> systems, including
-exclusive, shared, and update locks.</p>
-</conbody></concept>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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="cdevconcepts36402">
+<title>Types and scope of locks in Derby systems</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Locks<indexterm>exclusive</indexterm><indexterm>shared</indexterm><indexterm>update</indexterm></indexterm>
+</keywords>
+</metadata>
+</prolog>
+<conbody>
+<p>There are several types of locks available in <ph conref="devconrefs.dita#prod/productshortname"></ph> systems, including
+exclusive, shared, and update locks.</p>
+</conbody></concept>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts36402.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts36881.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts36881.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts36881.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts36881.dita Wed Mar 30 16:26:36 2005
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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">
-<title>Connections</title>
-<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>
-<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.) Depending
-on your <ph conref="devconrefs.dita#prod/productshortname"></ph> product license, 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>The following example shows an application establishing three separate
-connections to two different databases in the current system.</p>
-<codeblock>Connection conn = DriverManager.getConnection(
-    "jdbc:derby:sample");
-System.out.println("Connected to database sample");
-conn.setAutoCommit(false);
-Connection conn2 = DriverManager.getConnection(
-    "jdbc:derby:newDB;create=true");
-System.out.println("Created AND connected to newDB");
-conn2.setAutoCommit(false);
-Connection conn3 = DriverManager.getConnection(
-    "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>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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">
+<title>Connections</title>
+<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>
+<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.) Depending
+on your <ph conref="devconrefs.dita#prod/productshortname"></ph> product license, 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>The following example shows an application establishing three separate
+connections to two different databases in the current system.</p>
+<codeblock>Connection conn = DriverManager.getConnection(
+    "jdbc:derby:sample");
+System.out.println("Connected to database sample");
+conn.setAutoCommit(false);
+Connection conn2 = DriverManager.getConnection(
+    "jdbc:derby:newDB;create=true");
+System.out.println("Created AND connected to newDB");
+conn2.setAutoCommit(false);
+Connection conn3 = DriverManager.getConnection(
+    "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>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts36881.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts38375.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts38375.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts38375.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts38375.dita Wed Mar 30 16:26:36 2005
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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">
-<title>The JDBC Connection and Transaction Model</title>
-<prolog><metadata>
-<keywords>
-<indexterm>JDBC Connections</indexterm>
-<indexterm>Transactions</indexterm>
-</keywords>
-</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.
-This section includes the following topics:</p>
-<ul>
-<li><xref href="cdevconcepts36881.dita#cdevconcepts36881"/></li>
-<li><xref href="cdevconcepts19173.dita#cdevconcepts19173"/></li>
-</ul>
-</conbody></concept>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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">
+<title>The JDBC Connection and Transaction Model</title>
+<prolog><metadata>
+<keywords>
+<indexterm>JDBC Connections</indexterm>
+<indexterm>Transactions</indexterm>
+</keywords>
+</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.
+This section includes the following topics:</p>
+<ul>
+<li><xref href="cdevconcepts36881.dita#cdevconcepts36881"/></li>
+<li><xref href="cdevconcepts19173.dita#cdevconcepts19173"/></li>
+</ul>
+</conbody></concept>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts38375.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts41275.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts41275.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts41275.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts41275.dita Wed Mar 30 16:26:36 2005
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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">
-<title>SQL and JDBC ResultSet/Cursor mechanisms</title>
-<prolog><metadata>
-<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>
-<ul>
-<li><xref href="rdevconcepts88082.dita#rdevconcepts88082"/></li>
-<li><xref href="cdevconcepts28351.dita#cdevconcepts28351"/></li>
-<li><xref href="cdevconcepts23987.dita#cdevconcepts23987"/></li>
-<li><xref href="cdevconcepts22641.dita#cdevconcepts22641"/></li>
-<li><xref href="rdevconceptsholdablecursors.dita#rdevconceptsholdablecursors"/></li>
-</ul>
-</conbody></concept>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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">
+<title>SQL and JDBC ResultSet/Cursor mechanisms</title>
+<prolog><metadata>
+<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>
+<ul>
+<li><xref href="rdevconcepts88082.dita#rdevconcepts88082"/></li>
+<li><xref href="cdevconcepts28351.dita#cdevconcepts28351"/></li>
+<li><xref href="cdevconcepts23987.dita#cdevconcepts23987"/></li>
+<li><xref href="cdevconcepts22641.dita#cdevconcepts22641"/></li>
+<li><xref href="rdevconceptsholdablecursors.dita#rdevconceptsholdablecursors"/></li>
+</ul>
+</conbody></concept>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts41275.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts50894.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts50894.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts50894.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts50894.dita Wed Mar 30 16:26:36 2005
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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">
-<title>Debugging Deadlocks</title>
-<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>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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">
+<title>Debugging Deadlocks</title>
+<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>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts50894.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts53677.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts53677.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts53677.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts53677.dita Wed Mar 30 16:26:36 2005
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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>
-<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
-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
-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>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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>
+<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
+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
+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>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts53677.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts65864.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts65864.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts65864.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts65864.dita Wed Mar 30 16:26:36 2005
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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>
-<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>
-<ul>
-<li>Use row-level locking.</li>
-<li>Use the <i>TRANSACTION_READ_COMMITTED</i> isolation level.</li>
-<li>Avoid queries that cannot use indexes; they require locking of all the
-rows in the table (if only very briefly) and might block an update.</li>
-</ul>
-<p>In addition, some programmers might share a statement among multiple threads
-to avoid the overhead of each thread's having its own. Using the single statement
-cache, threads can share the same statement from <i>different connections</i>.
-For more information, see <?Pub Caret?>in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</p>
-</conbody>
-</concept>
-<?Pub *0000001100?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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>
+<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>
+<ul>
+<li>Use row-level locking.</li>
+<li>Use the <i>TRANSACTION_READ_COMMITTED</i> isolation level.</li>
+<li>Avoid queries that cannot use indexes; they require locking of all the
+rows in the table (if only very briefly) and might block an update.</li>
+</ul>
+<p>In addition, some programmers might share a statement among multiple threads
+to avoid the overhead of each thread's having its own. Using the single statement
+cache, threads can share the same statement from <i>different connections</i>.
+For more information, see <?Pub Caret?>in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</p>
+</conbody>
+</concept>
+<?Pub *0000001100?>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts65864.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts838179.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts838179.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts838179.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts838179.dita Wed Mar 30 16:26:36 2005
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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">
-<title>Statements</title>
-<prolog><metadata>
-<keywords>
-<indexterm>JDBC Statement<indexterm>definition</indexterm></indexterm>
-</keywords>
-</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>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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">
+<title>Statements</title>
+<prolog><metadata>
+<keywords>
+<indexterm>JDBC Statement<indexterm>definition</indexterm></indexterm>
+</keywords>
+</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>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts838179.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts838315.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts838315.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts838315.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts838315.dita Wed Mar 30 16:26:36 2005
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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">
-<title>ResultSets and Cursors</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Cursors<indexterm>all result sets as</indexterm></indexterm>
-</keywords>
-</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>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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">
+<title>ResultSets and Cursors</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Cursors<indexterm>all result sets as</indexterm></indexterm>
+</keywords>
+</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>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts838315.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts838850.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts838850.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts838850.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts838850.dita Wed Mar 30 16:26:36 2005
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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">
-<title>Transactions when auto-commit is disabled</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Auto-commit<indexterm>and  transactions</indexterm></indexterm>
-</keywords>
-</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>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>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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">
+<title>Transactions when auto-commit is disabled</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Auto-commit<indexterm>and  transactions</indexterm></indexterm>
+</keywords>
+</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>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>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts838850.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts839085.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts839085.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts839085.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts839085.dita Wed Mar 30 16:26:36 2005
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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">
-<title>Explicitly closing Statements, ResultSets, and Connections</title>
-<prolog><metadata>
-<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.
-If auto-commit is disabled, active transactions need to be explicitly committed
-or rolled back before closing the connection</p>
-</conbody></concept>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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">
+<title>Explicitly closing Statements, ResultSets, and Connections</title>
+<prolog><metadata>
+<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.
+If auto-commit is disabled, active transactions need to be explicitly committed
+or rolled back before closing the connection</p>
+</conbody></concept>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts839085.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts840995.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts840995.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts840995.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts840995.dita Wed Mar 30 16:26:36 2005
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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">
-<title>Holdable cursors and autocommit</title>
-<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>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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">
+<title>Holdable cursors and autocommit</title>
+<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>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts840995.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts842279.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts842279.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts842279.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts842279.dita Wed Mar 30 16:26:36 2005
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 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.  
-You may obtain a copy of the License at      
-
-   http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-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">
-<title>Exclusive locks</title>
-<prolog><metadata>
-<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
-system.</p>
-</conbody></concept>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Copyright 1997, 2004 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.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+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">
+<title>Exclusive locks</title>
+<prolog><metadata>
+<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
+system.</p>
+</conbody></concept>

Propchange: incubator/derby/docs/trunk/src/devguide/cdevconcepts842279.dita
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message