db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r386714 [8/9] - /db/derby/docs/trunk/src/devguide/
Date Fri, 17 Mar 2006 21:12:03 GMT
Modified: db/derby/docs/trunk/src/devguide/rdevadvjdbc034.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevadvjdbc034.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevadvjdbc034.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevadvjdbc034.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,30 +17,29 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevadvjdbc034">
+<reference id="rdevadvjdbc034" xml:lang="en-us">
 <title>The DriverPropertyInfo Array</title>
+<shortdesc>When a non-zero-length array is returned by <i>getPropertyInfo</i>,
+each element is a <codeph><i>DriverPropertyInfo</i></codeph> object representing
+a connection URL attribute that has not already been specified. Only those
+that make sense in the current context are returned.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>DriverPropertyInfo Array</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>DriverPropertyInfo Array</indexterm></keywords>
+</metadata></prolog>
 <refbody>
-<section><p>When a non-zero-length array is returned by <i>getPropertyInfo</i>, each element is a <codeph><i>DriverPropertyInfo</i></codeph> object
-representing a connection URL attribute that has not already been specified. Only those
-that make sense in the current context are returned.</p></section>
-<section><p>This <i>DriverPropertyInfo</i> object contains:</p></section><section>
-<ul>
+<section><p>This <i>DriverPropertyInfo</i> object contains:</p></section>
+<section> <ul>
 <li><i>name of the attribute</i></li>
 <li><i>description</i></li>
-<li><i>current value</i>  
-<p>If an attribute has a default
-value, this is set in the value field of <i>DriverPropertyInfo</i>, even if the attribute has not been set in the connection URL or the <codeph><i>Properties</i></codeph> object. If the attribute does not have
-a default value and it is not set in the URL or the <codeph><i>Properties</i></codeph> object, its value will be null.</p></li>
+<li><i>current value</i>   <p>If an attribute has a default value, this is
+set in the value field of <i>DriverPropertyInfo</i>, even if the attribute
+has not been set in the connection URL or the <codeph><i>Properties</i></codeph> object.
+If the attribute does not have a default value and it is not set in the URL
+or the <codeph><i>Properties</i></codeph> object, its value will be null.</p></li>
 <li><i>list of choices</i></li>
 <li><i>whether required for a connection request</i></li>
 </ul></section>
-<section><p>Several fields in a <i>DriverPropertyInfo</i> object are
-allowed to be null.</p></section>
-</refbody></reference>
+<section><p>Several fields in a <i>DriverPropertyInfo</i> object are allowed
+to be null.</p></section>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevconcepts1119.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevconcepts1119.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevconcepts1119.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevconcepts1119.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,18 +17,18 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevconcepts1119">
+<reference id="rdevconcepts1119" xml:lang="en-us">
 <title>Non-holdable cursor example</title>
-<prolog>
-</prolog>
+<shortdesc>The following example uses <i>Connection.createStatement</i> to
+return a <codeph><i>ResultSet</i></codeph>  that will close after a commit
+is performed.</shortdesc>
+<prolog></prolog>
 <refbody>
-<section><p>The following example uses <i>Connection.createStatement</i> to return a <codeph><i>ResultSet</i></codeph>  that will
-close after a commit is performed:</p></section><example>
-<codeblock>Connection conn = ds.getConnection(user, passwd);
+<example> <codeblock>Connection conn = ds.getConnection(user, passwd);
 Statement stmt =
 conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
                   ResultSet.CONCUR_READ_ONLY,
                   ResultSet.CLOSE_CURSORS_AT_COMMIT);
 </codeblock></example>
-</refbody></reference>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevconcepts2462.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevconcepts2462.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevconcepts2462.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevconcepts2462.dita Fri Mar 17 13:11:50 2006
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -19,11 +18,9 @@
 -->
 <reference id="rdevconcepts2462" xml:lang="en-us">
 <title>Lock compatibility</title>
-<prolog></prolog>
+<shortdesc>This table lists compatibility between lock types. <codeph>+</codeph> means
+the lock types are compatible,  while <codeph>-</codeph> means they are incompatible.</shortdesc>
 <refbody>
-<section><p><xref href="rdevconcepts2462.dita#rdevconcepts2462/cdevconceptslock_mtrx"></xref> lists
-compatibility between lock types. <cite>+</cite> means compatible,  <cite>-</cite> means
-incompatible.</p></section>
 <table frame="all" id="cdevconceptslock_mtrx"><title>Lock Compatibility Matrix</title>
 <tgroup cols="4" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="29*"/>
 <colspec colname="2" colnum="2" colwidth="24*"/><colspec colname="3" colnum="3"

Modified: db/derby/docs/trunk/src/devguide/rdevconcepts600.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevconcepts600.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevconcepts600.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevconcepts600.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,18 +17,16 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevconcepts600">
+<reference id="rdevconcepts600" xml:lang="en-us">
 <title>Example of threads sharing a statement</title>
+<shortdesc>This example shows what can happen if two threads try to share
+a single<i> Statement</i>.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Statements shared by threads<indexterm>dangers of</indexterm></indexterm>
+<keywords><indexterm>Statements shared by threads<indexterm>dangers of</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <refbody>
-<section><p>This example shows what can happen if two threads try to share a single<i> Statement</i>.</p></section><example>
-<codeblock>PreparedStatement ps = conn.prepareStatement(
+<example> <codeblock>PreparedStatement ps = conn.prepareStatement(
     "UPDATE account SET balance =  balance + ? WHERE id = ?");
 <b>/* now assume two threads T1,T2 are given this
 java.sql.PreparedStatement object </b>and that the following events
@@ -43,11 +44,14 @@
  T2 - ps.executeUpdate();
 <b>/* Also, the auto-commit mode of the connection can lead
 to some strange behavior.*/</b></codeblock></example>
-<section><p>If it is absolutely necessary, the application can get around this problem
-with Java synchronization.</p></section>
-<section><p>If the threads each obtain their own <i>PreparedStatement</i> (with identical text), their <codeph><i>setXXX</i></codeph> calls
-do not interfere with each other. Moreover, <ph conref="devconrefs.dita#prod/productshortname"></ph> is able to share the
-same compiled query plan between the two statements; it needs to maintain
-only separate state information. However, there is the potential for confusion
-in regard to the timing of the <i>commit</i>, since a single <i>commit</i> commits all the statements in a transaction.</p></section>
-</refbody></reference>
+<section><p>If it is absolutely necessary, the application can get around
+this problem with Java synchronization.</p></section>
+<section><p>If the threads each obtain their own <i>PreparedStatement</i> (with
+identical text), their <codeph><i>setXXX</i></codeph> calls do not interfere
+with each other. Moreover, <ph conref="devconrefs.dita#prod/productshortname"></ph> is
+able to share the same compiled query plan between the two statements; it
+needs to maintain only separate state information. However, there is the potential
+for confusion in regard to the timing of the <i>commit</i>, since a single <i>commit</i> commits
+all the statements in a transaction.</p></section>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevconcepts713.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevconcepts713.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevconcepts713.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevconcepts713.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -18,6 +19,8 @@
 -->
 <reference id="rdevconcepts713" xml:lang="en-us">
 <title>Deployment options and threading and connection modes</title>
+<shortdesc>A database can be available to multiple connections in several
+situations.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Deployment modes<indexterm>threading/connection modes
 and</indexterm></indexterm><indexterm>Multi-threaded applications</indexterm>
@@ -26,8 +29,6 @@
 to server</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p>A database can be available to multiple connections in the following
-situations:</p></section>
 <section> <ul>
 <li>Multiple applications access a single database (possible only when <ph
 conref="devconrefs.dita#prod/productshortname"></ph> is running inside a server
@@ -55,7 +56,7 @@
 <entry colname="2">Supply a single <i>Connection</i> object to separate threads. <ph
 conref="devconrefs.dita#prod/productshortname"></ph> ensures that only one
 operation is applied at a time for consistency. Server frameworks automatically
-manage multi-threaded operations. For more information, see <xref href="cdevconcepts19173.dita#cdevconcepts19173"></xref>.</entry>
+manage multi-threaded operations..</entry>
 <entry colname="3">Server frameworks can automatically multi-thread operations.
 Remote client applications can multi-thread if desired.</entry>
 </row>

Modified: db/derby/docs/trunk/src/devguide/rdevconcepts8424.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevconcepts8424.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevconcepts8424.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevconcepts8424.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,73 +17,60 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevconcepts8424">
+<reference id="rdevconcepts8424" xml:lang="en-us">
 <title>Scope of locks</title>
+<shortdesc>The amount of data locked by a statement can vary.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Locks<indexterm>scope of</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Locks<indexterm>scope of</indexterm></indexterm></keywords>
+</metadata></prolog>
 <refbody>
-<section><p>The amount of data locked by a statement can vary. </p></section><section>
-<ul>
-<li><i>table locks</i>  
-<p>A statement can lock the <i>entire table</i>.</p>
-<p>Table-level locking systems always lock entire tables.</p>
-<p>Row-level locking systems can lock entire tables if the WHERE clause
-of a statement cannot use an index. For example, UPDATES that cannot use an
-index lock the entire table.</p>
-<p>Row-level locking systems can lock entire
-tables if a high number of single-row locks would be less efficient than a
-single table-level lock. Choosing table-level locking instead of row-level
-locking for performance reasons is called <i>lock escalation</i>. (For more information about this topic, see "About the System's
-Selection of Lock Granularity" and "Transaction-Based Lock Escalation"
-in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.)</p></li>
-<li><i>single-row locks</i>  
-<p>A statement can lock only <i>a single row</i> at a time.</p>
-<p>This section applies only
-to row-level locking systems. </p>
-<p>For TRANSACTION_READ_COMMITTED or TRANSACTION_REPEATABLE_READ
-isolation, <ph conref="devconrefs.dita#prod/productshortname"></ph> treats rows as cursors for SELECT statements. It locks
-rows only as the application steps through the rows in the result. The current
-row is locked. The row lock is released when the application goes to the next
-row. (For TRANSACTION_SERIALIZABLE isolation, however, <ph conref="devconrefs.dita#prod/productshortname"></ph> locks the
-whole set before the application begins stepping through.) For TRANSACTION_READ_UNCOMMITTED,
-no row locks are requested.</p>
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph> locks single rows for INSERT
-statements, holding each row until the transaction is committed. (If there
-is an index associated with the table, the previous key is also locked.)</p></li>
-<li><i>range locks</i>  
-<p>A statement can lock <i>a range of rows</i> (range lock).</p>
-<p>This section applies only to row-level
-locking systems. </p>
-<p>For <i>any</i> isolation level, <ph conref="devconrefs.dita#prod/productshortname"></ph> locks <i>all the rows in the result</i> plus an entire range of rows
-for updates or deletes.</p>
-<p>For the TRANSACTION_SERIALIZABLE isolation level, <ph conref="devconrefs.dita#prod/productshortname"></ph> locks
+<section> <ul>
+<li><i>table locks</i>   <p>A statement can lock the <i>entire table</i>.</p> <p>Table-level
+locking systems always lock entire tables.</p> <p>Row-level locking systems
+can lock entire tables if the WHERE clause of a statement cannot use an index.
+For example, UPDATES that cannot use an index lock the entire table.</p> <p>Row-level
+locking systems can lock entire tables if a high number of single-row locks
+would be less efficient than a single table-level lock. Choosing table-level
+locking instead of row-level locking for performance reasons is called <i>lock
+escalation</i>. (For more information about this topic, see "About the System's
+Selection of Lock Granularity" and "Transaction-Based Lock Escalation" in <cite><ph
+conref="devconrefs.dita#pub/cittuning"></ph></cite>.)</p></li>
+<li><i>single-row locks</i>   <p>A statement can lock only <i>a single row</i> at
+a time.</p> <p>This section applies only to row-level locking systems. </p> <p>For
+TRANSACTION_READ_COMMITTED or TRANSACTION_REPEATABLE_READ isolation, <ph conref="devconrefs.dita#prod/productshortname"></ph> treats
+rows as cursors for SELECT statements. It locks rows only as the application
+steps through the rows in the result. The current row is locked. The row lock
+is released when the application goes to the next row. (For TRANSACTION_SERIALIZABLE
+isolation, however, <ph conref="devconrefs.dita#prod/productshortname"></ph> locks
+the whole set before the application begins stepping through.) For TRANSACTION_READ_UNCOMMITTED,
+no row locks are requested.</p> <p><ph conref="devconrefs.dita#prod/productshortname"></ph> locks
+single rows for INSERT statements, holding each row until the transaction
+is committed. (If there is an index associated with the table, the previous
+key is also locked.)</p></li>
+<li><i>range locks</i>   <p>A statement can lock <i>a range of rows</i> (range
+lock).</p> <p>This section applies only to row-level locking systems. </p> <p>For <i>any</i> isolation
+level, <ph conref="devconrefs.dita#prod/productshortname"></ph> locks <i>all
+the rows in the result</i> plus an entire range of rows for updates or deletes.</p> <p>For
+the TRANSACTION_SERIALIZABLE isolation level, <ph conref="devconrefs.dita#prod/productshortname"></ph> locks
 all the rows in the result plus an entire range of rows in the table for SELECTs
-to prevent nonrepeatable reads and phantoms.</p>
-<p>For example, if a SELECT
-statement specifies rows in the <i>Employee</i> table where
-the <i>salary</i> is BETWEEN two values, the system can lock
-more than just the actual rows it returns in the result. It also must lock
-the entire <i>range</i> of rows between those two values
-to prevent another transaction from inserting, deleting, or updating a row
-within that range.</p>
-<p>An index must be available for a range lock. If one
-is not available, <ph conref="devconrefs.dita#prod/productshortname"></ph> locks the entire table.</p>
-<table id="cdevconcepts15873" frame="all">
-<title>Possible Types and Scopes of Locking</title>
-<tgroup cols="3" colsep="1" rowsep="1">
-<colspec colnum="1" colname="1" colwidth="1159*"/>
-<colspec colnum="2" colname="2" colwidth="979*"/>
-<colspec colnum="3" colname="3" colwidth="1759*"/>
+to prevent nonrepeatable reads and phantoms.</p> <p>For example, if a SELECT
+statement specifies rows in the <i>Employee</i> table where the <i>salary</i> is
+BETWEEN two values, the system can lock more than just the actual rows it
+returns in the result. It also must lock the entire <i>range</i> of rows between
+those two values to prevent another transaction from inserting, deleting,
+or updating a row within that range.</p> <p>An index must be available for
+a range lock. If one is not available, <ph conref="devconrefs.dita#prod/productshortname"></ph> locks
+the entire table.</p> <table frame="all" id="cdevconcepts15873"><title>Possible
+Types and Scopes of Locking</title>
+<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="1159*"/>
+<colspec colname="2" colnum="2" colwidth="979*"/><colspec colname="3" colnum="3"
+colwidth="1759*"/>
 <thead>
 <row>
-<entry colname="1" valign="bottom" align="left">Transaction Isolation Level</entry>
-<entry colname="2" valign="bottom" align="left">Table-Level Locking</entry>
-<entry colname="3" valign="bottom" align="left">Row-Level Locking</entry></row>
+<entry align="left" colname="1" valign="bottom">Transaction Isolation Level</entry>
+<entry align="left" colname="2" valign="bottom">Table-Level Locking</entry>
+<entry align="left" colname="3" valign="bottom">Row-Level Locking</entry>
+</row>
 </thead>
 <tbody>
 <row>
@@ -89,23 +79,27 @@
 using this isolation level. For other statements, same as for TRANSACTION_
 READ_ COMMITTED.</entry>
 <entry colname="3">SELECT statements get no locks. For other statements, same
-as for TRANSACTION_ READ_COMMITTED.</entry></row>
+as for TRANSACTION_ READ_COMMITTED.</entry>
+</row>
 <row>
 <entry colname="1">Connection. TRANSACTION_ READ_COMMITTED (SQL: CS) </entry>
 <entry colname="2">SELECT statements get a shared lock on the entire table.
-The locks are released when the user closes the <i>ResultSet</i>. Other statements get exclusive locks on the entire table, which are
-released when the transaction commits.</entry>
+The locks are released when the user closes the <i>ResultSet</i>. Other statements
+get exclusive locks on the entire table, which are released when the transaction
+commits.</entry>
 <entry colname="3">SELECTs lock and release single rows as the user steps
-through the <i>ResultSet</i>. UPDATEs and DELETEs get exclusive
-locks on a range of rows. INSERT statements get exclusive locks on single
-rows (and sometimes on the preceding rows).</entry></row>
+through the <i>ResultSet</i>. UPDATEs and DELETEs get exclusive locks on a
+range of rows. INSERT statements get exclusive locks on single rows (and sometimes
+on the preceding rows).</entry>
+</row>
 <row>
 <entry colname="1">Connection. TRANSACTION_ REPEATABLE_READ (SQL: RS)</entry>
 <entry colname="2">Same as for TRANSACTION_ SERIALIZABLE</entry>
 <entry colname="3">SELECT statements get shared locks on the rows that satisfy
 the WHERE clause (but do not prevent inserts into this range). UPDATEs and
 DELETEs get exclusive locks on a range of rows. INSERT statements get exclusive
-locks on single rows (and sometimes on the preceding rows).</entry></row>
+locks on single rows (and sometimes on the preceding rows).</entry>
+</row>
 <row>
 <entry colname="1">Connection. TRANSACTION_ SERIALIZABLE (SQL: RR)</entry>
 <entry colname="2">SELECT statements get a shared lock on the entire table.
@@ -114,9 +108,11 @@
 <entry colname="3">SELECT statements get shared locks on a range of rows.
 UPDATE and DELETE statements get exclusive locks on a range of rows. INSERT
 statements get exclusive locks on single rows (and sometimes on the preceding
-rows).</entry></row>
+rows).</entry>
+</row>
 </tbody>
 </tgroup>
 </table></li>
 </ul></section>
-</refbody></reference>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevconcepts88082.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevconcepts88082.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevconcepts88082.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevconcepts88082.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -18,10 +19,11 @@
 -->
 <reference id="rdevconcepts88082" xml:lang="en-us">
 <title>Simple non-updatable ResultSets</title>
+<shortdesc>This example is an excerpt from a sample JDBC application that
+generates a <i>ResultSet</i> with a simple SELECT statement and then processes
+the rows.</shortdesc>
 <prolog></prolog>
 <refbody>
-<section><p>Here is an excerpt from a sample JDBC application that generates
-a <i>ResultSet</i> with a simple SELECT statement and then processes the rows.</p></section>
 <example> <codeblock>Connection conn = DriverManager.getConnection(
     "jdbc:derby:sample");
 Statement s = conn.createStatement();

Modified: db/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,27 +17,25 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rdevconceptsholdablecursors" xml:lang="en-us">
 <title>Holdable cursors</title>
+<shortdesc>The holdable cursor feature permits an application to keep cursors
+open after implicit or explicit commits. By default, the cursors are held
+open after a commit.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Cursors<indexterm>holdable</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
 <section> <note> Non-holdable cursors are only available in Java 2 Platform,
 Standard Edition, v 1.4 (J2SE) environments.</note></section>
-<section><p>The holdable cursor feature permits an application to keep cursors
-open after implicit or explicit commits. By default, the cursors are held
-open after a commit. Starting with Java 2 Platform, Standard
-Edition, v 1.4 (J2SE), cursors can be created with close when a commit occurs
-option. Such cursors will be automatically closed when a commit happens. Cursors
-are automatically closed when a transaction aborts, whether or not they have
-been specified to be held open.</p></section>
-<section> <note> Holdable cursors do not work with XA transactions, in <ph conref="devconrefs.dita#prod/productshortname"></ph>
-Version 10.1, therefore cursors should be opened with holdability false when
-working with XA transactions.</note></section>
+<section><p>Starting with Java 2 Platform, Standard Edition, v 1.4 (J2SE),
+cursors can be created with close when a commit occurs option. Such cursors
+will be automatically closed when a commit happens. Cursors are automatically
+closed when a transaction aborts, whether or not they have been specified
+to be held open.</p></section>
+<section> <note> Holdable cursors do not work with XA transactions, in <ph
+conref="devconrefs.dita#prod/productshortname"></ph> Version 10.1, therefore
+cursors should be opened with holdability false when working with XA transactions.</note></section>
 <section><p>To specify whether a cursor should be held open after a commit
 takes place, supply one of the following <i>ResultSet</i> parameters to the <codeph><i>Connection</i></codeph> method <codeph><i>createStatement</i
 ></codeph>, <codeph><i>prepareStatement</i></codeph>, or <codeph><i>prepareCall</i></codeph>:</p></section>
@@ -46,7 +47,8 @@
 </ul></section>
 <section><p>The method <i>Statement.getResultSetHoldability()</i> indicates
 whether a cursor generated by the Statement object stays open or closes, upon
-commit. See the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite> for more information.</p></section>
+commit. See the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite> for
+more information.</p></section>
 <section><p>When an implicit or explicit commit occurs, <i>ResultSets</i> that
 hold cursors open behave as follows:</p></section>
 <section> <ul>
@@ -62,11 +64,9 @@
 </ul></li>
 </ul></section>
 <section><p>When a rollback occurs either explicitly or implicitly, the following
-behavior applies:</p></section>
-<section> <ul>
+behavior applies:<ul>
 <li>All open <i>ResultSets</i> are closed.</li>
 <li>All locks acquired during the unit of work are released.</li>
-</ul></section>
+</ul></p></section>
 </refbody>
 </reference>
-

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure125.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevcsecure125.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure125.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure125.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure125">
+<reference id="rdevcsecure125" xml:lang="en-us">
 <title>User authentication example in a client/server environment</title>
-<prolog>
-</prolog>
+<shortdesc>In this example, <ph conref="devconrefs.dita#prod/productshortname"></ph> is
+running in a user-designed application server.</shortdesc>
+<prolog></prolog>
 <refbody>
-<section><p>In this example, <ph conref="devconrefs.dita#prod/productshortname"></ph> is running in a user-designed application
-server. <ph conref="devconrefs.dita#prod/productshortname"></ph> provides the user authentication, not the application
-server. The server is running in a secure environment, the application server
-encrypts the passwords, and a database administrator is available. The administrator
-configures security using system-level properties in the <i>derby.properties</i> file and has protected this file with operating system
-tools. <ph conref="devconrefs.dita#prod/productshortname"></ph> connects to an existing LDAP directory service within the
-enterprise to authenticate users.</p></section>
-<section><p>The default access mode for all databases is set to <i>fullAccess</i> (the default).</p></section>
-<section><p>The <i>derby.properties</i> file for the server includes
-the following entries:</p></section><example>
-<codeblock><b># turn on user authentication</b>
+<section><p><ph conref="devconrefs.dita#prod/productshortname"></ph> provides
+the user authentication, not the application server. The server is running
+in a secure environment, the application server encrypts the passwords, and
+a database administrator is available. The administrator configures security
+using system-level properties in the <i>derby.properties</i> file and has
+protected this file with operating system tools. <ph conref="devconrefs.dita#prod/productshortname"></ph> connects
+to an existing LDAP directory service within the enterprise to authenticate
+users.</p></section>
+<section><p>The default access mode for all databases is set to <i>fullAccess</i> (the
+default).</p></section>
+<section><p>The <i>derby.properties</i> file for the server includes the following
+entries:</p></section>
+<example> <codeblock><b># turn on user authentication</b>
 derby.connection.requireAuthentication=true
 <b># set the authentication provider to an external LDAP server</b>
 derby.authentication.provider=LDAP
@@ -40,15 +45,16 @@
 derby.authentication.ldap.searchBase=o=oakland.mycompany.com
 <b># explicitly show the access mode for databases (this is default)</b>
 derby.database.defaultAccessMode=fullAccess</codeblock></example>
-<section><p>With these settings, all users must be authenticated by the LDAP server
-in order to access any <ph conref="devconrefs.dita#prod/productshortname"></ph> databases.</p></section>
-<section><p>The database administrator has determined that one database, <i>accountingDB</i>, has additional security needs. Within a connection to that
-database, the database administrator uses database-wide properties (which
-override properties set in the <i>derby.properties</i> file)
-to limit access to this database. Only the users <i>prez</i>, <i>cfo</i>, and <i>numberCruncher</i> have full
-(read-write) access to this database, and only <i>clerk1</i> and <i>clerk2</i> have read-only access to this database. No other
-users can access the database.</p></section><example>
-<codeblock><b>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+<section><p>With these settings, all users must be authenticated by the LDAP
+server in order to access any <ph conref="devconrefs.dita#prod/productshortname"></ph> databases.</p></section>
+<section><p>The database administrator has determined that one database, <i>accountingDB</i>,
+has additional security needs. Within a connection to that database, the database
+administrator uses database-wide properties (which override properties set
+in the <i>derby.properties</i> file) to limit access to this database. Only
+the users <i>prez</i>, <i>cfo</i>, and <i>numberCruncher</i> have full (read-write)
+access to this database, and only <i>clerk1</i> and <i>clerk2</i> have read-only
+access to this database. No other users can access the database.</p></section>
+<example> <codeblock><b>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.database.defaultAccessMode', 'noAccess')
 
 CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
@@ -57,8 +63,9 @@
 
 CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.database.readAccessUsers', 'clerk1,clerk2')</b></codeblock></example>
-<section><p>The database administrator then requires all current users to disconnect
-and re-connect. These property changes do not go into effect for current connections.
-The database administrator can force current users to reconnect by shutting
-down the database</p></section>
-</refbody></reference>
+<section><p>The database administrator then requires all current users to
+disconnect and re-connect. These property changes do not go into effect for
+current connections. The database administrator can force current users to
+reconnect by shutting down the database</p></section>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure131.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevcsecure131.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure131.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure131.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,32 +17,31 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure131">
+<reference id="rdevcsecure131" xml:lang="en-us">
 <title>Examples of user authorization</title>
-<prolog>
-</prolog>
+<shortdesc>This example shows the property settings to configure a database
+to support.</shortdesc>
+<prolog></prolog>
 <refbody>
-<section><p>This example shows the property settings to configure a database to support: </p></section><section>
-<ul>
+<section> <ul>
 <li>Full access for a single user named "sa"</li>
-<li>Read-only access for anyone else who connects to the database   
-<codeblock><b>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+<li>Read-only access for anyone else who connects to the database    <codeblock>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.database.defaultConnectionMode',
-    'readOnlyAccess')</b>
-<b>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
-    'derby.database.fullAccessUsers', 'sa')</b></codeblock></li>
+    'readOnlyAccess')
+CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+    'derby.database.fullAccessUsers', 'sa')</codeblock></li>
 </ul></section>
-<section><p>The following example shows the settings to configure a database to support: </p></section><section>
-<ul>
-<li>Full access for a single user named "Fred!" (case-sensitive) with
-full (read-write) access </li>
+<section><p>The following example shows the settings to configure a database
+to support.</p></section>
+<section> <ul>
+<li>Full access for a single user named "Fred!" (case-sensitive) with full
+(read-write) access </li>
 <li>Read-only access for mary and guest </li>
 <li>No access for other users</li>
 </ul></section>
-<section><p>The example also demonstrates the use of delimited identifiers for user
-names.</p></section><example>
-<codeblock><b>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+<section><p>The example also demonstrates the use of delimited identifiers
+for user names.</p></section>
+<example> <codeblock>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.database.defaultConnectionMode',
     'noAccess')
 
@@ -47,5 +49,6 @@
     'derby.database.fullAccessUsers', '"Fred!"')
 
 CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
-    'derby.database.readOnlyAccessUsers', 'mary,guest')</b></codeblock></example>
-</refbody></reference>
+    'derby.database.readOnlyAccessUsers', 'mary,guest')</codeblock></example>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure13713.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevcsecure13713.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure13713.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure13713.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -18,20 +19,20 @@
 -->
 <reference id="rdevcsecure13713" xml:lang="en-us">
 <title>User authentication example in a single-user, embedded environment</title>
+<shortdesc>In this example, <ph conref="devconrefs.dita#prod/productshortname"></ph> is
+embedded in a single-user application that is deployed in a number of different
+and potentially insecure ways.</shortdesc>
 <prolog></prolog>
 <refbody>
-<section><p>In this example, <ph conref="devconrefs.dita#prod/productshortname"></ph> is
-embedded in a single-user application that is deployed in a number of different
-and potentially insecure ways. For that reason, the application developer
-has decided to encrypt the database and to turn on user authentication using <ph
-conref="devconrefs.dita#prod/productshortname"></ph>'s built-in user authentication,
-which will not require connections to an LDAP server. The end-user must know
-the <i>bootPassword</i> to boot the database and the user name and password
-to connect to the database. Even if the database ended up in an e-mail, only
-the intended recipient would be able to access data in the database. The application
-developer has decided not to use any user authorization features, since each
-database will accept only a single user. In that situation, the default full-access
-connection mode is acceptable.</p></section>
+<section><p>For that reason, the application developer has decided to encrypt
+the database and to turn on user authentication using <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
+built-in user authentication, which will not require connections to an LDAP
+server. The end-user must know the <i>bootPassword</i> to boot the database
+and the user name and password to connect to the database. Even if the database
+ended up in an e-mail, only the intended recipient would be able to access
+data in the database. The application developer has decided not to use any
+user authorization features, since each database will accept only a single
+user. In that situation, the default full-access connection mode is acceptable.</p></section>
 <section><p>When creating the database, the application developer encrypts
 the database by using the following connection URL:</p></section>
 <example> <codeblock><b>jdbc:derby:wombat;create=true;dataEncryption=true;

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure190.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevcsecure190.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure190.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure190.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,63 +17,65 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure190">
+<reference id="rdevcsecure190" xml:lang="en-us">
 <title>Read-only and full access permissions</title>
+<shortdesc>This table shows which actions read-only and full-access users
+are permitted to perform on regular or source databases and on target databases.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Permissions</indexterm>
-<indexterm>Read-only access<indexterm>definition</indexterm></indexterm>
-<indexterm>Full access<indexterm>definition</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>Permissions</indexterm><indexterm>Read-only access<indexterm>definition</indexterm></indexterm>
+<indexterm>Full access<indexterm>definition</indexterm></indexterm></keywords>
+</metadata></prolog>
 <refbody>
-<section><p><xref href="rdevcsecure190.dita#rdevcsecure190/cdevcsecure20486"/> shows which actions read-only
-and full-access users are permitted to perform on regular or source databases
-and on target databases.</p></section>
-<table id="cdevcsecure20486" frame="all">
-<title>Permissions for Read-Only and Full-Access Users</title>
-<tgroup cols="3" colsep="1" rowsep="1">
-<colspec colnum="1" colname="1" colwidth="37*"/>
-<colspec colnum="2" colname="2" colwidth="21*"/>
-<colspec colnum="3" colname="3" colwidth="36*"/>
+<table frame="all" id="cdevcsecure20486"><title>Permissions for Read-Only
+and Full-Access Users</title>
+<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="37*"/>
+<colspec colname="2" colnum="2" colwidth="21*"/><colspec colname="3" colnum="3"
+colwidth="36*"/>
 <thead>
 <row>
-<entry colname="1" valign="bottom" align="left">Action</entry>
-<entry colname="2" valign="bottom" align="left">Read-Only Users</entry>
-<entry colname="3" valign="bottom" align="left">Full-Access Users</entry></row>
+<entry align="left" colname="1" valign="bottom">Action</entry>
+<entry align="left" colname="2" valign="bottom">Read-Only Users</entry>
+<entry align="left" colname="3" valign="bottom">Full-Access Users</entry>
+</row>
 </thead>
 <tbody>
 <row>
 <entry colname="1">Executing SELECT statements</entry>
 <entry colname="2">X</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 <row>
 <entry colname="1">Reading database properties</entry>
 <entry colname="2">X</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 <row>
 <entry colname="1">Loading database classes from jar files</entry>
 <entry colname="2">X</entry>
-<entry colname="3">X</entry></row>
+<entry colname="3">X</entry>
+</row>
 <row>
 <entry colname="1">Executing INSERT, UPDATE, or DELETE statements</entry>
-<entry colname="2"/>
-<entry colname="3">X</entry></row>
+<entry colname="2"></entry>
+<entry colname="3">X</entry>
+</row>
 <row>
 <entry colname="1">Executing DDL statements</entry>
-<entry colname="2"/>
-<entry colname="3">X</entry></row>
+<entry colname="2"></entry>
+<entry colname="3">X</entry>
+</row>
 <row>
 <entry colname="1">Adding or replacing jar files</entry>
-<entry colname="2"/>
-<entry colname="3">X</entry></row>
+<entry colname="2"></entry>
+<entry colname="3">X</entry>
+</row>
 <row>
 <entry colname="1">Setting database properties</entry>
-<entry colname="2"/>
-<entry colname="3">X</entry></row>
+<entry colname="2"></entry>
+<entry colname="3">X</entry>
+</row>
 </tbody>
 </tgroup>
 </table>
-</refbody></reference>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure26537.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevcsecure26537.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure26537.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure26537.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,16 +17,14 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure26537">
+<reference id="rdevcsecure26537" xml:lang="en-us">
 <title>User authentication and authorization extended examples</title>
-<prolog>
-</prolog>
+<shortdesc>The following two examples from the <i>sample</i> database show
+how to turn on and turn off user authentication using <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
+built-in user authentication and user authorization.</shortdesc>
+<prolog></prolog>
 <refbody>
-<section><p>The following two examples from the <i>sample</i> database
-show how to turn on and turn off user authentication using <ph conref="devconrefs.dita#prod/productshortname"></ph>'s
-built-in user authentication and user authorization.</p></section><example>
-<codeblock>/** 
+<example> <codeblock>/** 
 	  * Turn on built-in user authentication and user authorization. 
 	  * 
 	  * @param conn a connection to the database.
@@ -92,8 +93,8 @@
 		s.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" + 
 			"'derby.database.propertiesOnly', 'false')"); 
 		s.close(); 
-	} </codeblock></example><example>
-<codeblock>/** 
+	} </codeblock></example>
+<example> <codeblock>/** 
 	  * Turn off built-in user authentication and user authorization. 
 	  * 
 	  * @param conn a connection to the database.
@@ -140,4 +141,5 @@
 	}
 }
 </codeblock></example>
-</refbody></reference>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure305.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevcsecure305.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure305.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure305.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,13 +17,12 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure305">
+<reference id="rdevcsecure305" xml:lang="en-us">
 <title>Login failure exceptions with user authentication</title>
-<prolog>
-</prolog>
+<shortdesc>If user authentication is turned on and a valid user name and password
+are not provided, <i>SQLException</i> 08004 is raised.</shortdesc>
+<prolog></prolog>
 <refbody>
-<section><p>If user authentication is turned on and a valid user name and password
-are not provided, <i>SQLException</i> 08004 is raised.</p></section><example>
-<codeblock>ERROR 08004: Connection refused : Invalid authentication.</codeblock></example>
-</refbody></reference>
+<example> <codeblock>ERROR 08004: Connection refused : Invalid authentication.</codeblock></example>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure379.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevcsecure379.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure379.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure379.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,14 +17,13 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure379">
+<reference id="rdevcsecure379" xml:lang="en-us">
 <title>User authorization exceptions</title>
-<prolog>
-</prolog>
+<shortdesc>If a user is not authorized to connect to the database specified
+in the connection request, <i>SQLException</i> 04501 is raised.</shortdesc>
+<prolog></prolog>
 <refbody>
-<section><p>If a user is not authorized to connect to the database specified in the
-connection request, <i>SQLException</i> 04501 is raised.</p></section>
-<section><p>If a user with <i>readOnlyAccess</i> attempts to write
-to a database, <i>SQLException</i> 08004 <codeph><i>- connection refused</i></codeph> is raised.</p></section>
-</refbody></reference>
+<section><p>If a user with <i>readOnlyAccess</i> attempts to write to a database, <i>SQLException</i> 08004 <codeph><i>-
+connection refused</i></codeph> is raised.</p></section>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure557.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevcsecure557.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure557.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure557.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -18,9 +19,8 @@
 -->
 <reference id="rdevcsecure557" xml:lang="en-us">
 <title>List of user-authentication properties</title>
+<shortdesc>This table summarizes the various properties related to user authentication.</shortdesc>
 <refbody>
-<section><p><xref href="rdevcsecure557.dita#rdevcsecure557/cdevcsecure27690"></xref> summarizes
-the various properties related to user authentication.</p></section>
 <table frame="all" id="cdevcsecure27690"><title>User Authentication Properties</title>
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="53*"/>
 <colspec colname="2" colnum="2" colwidth="45*"/>

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure608.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevcsecure608.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure608.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure608.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -18,6 +19,8 @@
 -->
 <reference id="rdevcsecure608" xml:lang="en-us">
 <title>Libraries for LDAP user authentication</title>
+<shortdesc>To use an LDAP directory service with <ph conref="devconrefs.dita#prod/productshortname"></ph>,
+you need these libraries in your classpath.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>jndid<indexterm>required for LDAP user authorization</indexterm></indexterm>
 <indexterm>ldap.jar<indexterm>required for LDAP user authorization</indexterm></indexterm>
@@ -25,8 +28,6 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p>To use an LDAP directory service with <ph conref="devconrefs.dita#prod/productshortname"></ph>,
-you need the following libraries in your classpath:</p></section>
 <section> <ul>
 <li><i>jndi.jar</i>   <p>JNDI classes</p></li>
 <li><i>ldap.jar</i>   <p>LDAP provider from Sun</p></li>

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure622.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevcsecure622.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure622.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure622.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,13 +17,11 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure622">
+<reference id="rdevcsecure622" xml:lang="en-us">
 <title>Exceptions when using authorization identifiers</title>
-<prolog>
-</prolog>
-<refbody>
-<section><p>Specifying an invalid authorization identifier in a database user authorization
-property raises an exception. Specifying an invalid authorization identifier
-in a connection request raises an exception.</p></section>
-</refbody></reference>
+<shortdesc>Specifying an invalid authorization identifier in a database user
+authorization property raises an exception. Specifying an invalid authorization
+identifier in a connection request raises an exception.</shortdesc>
+<prolog></prolog>
+<refbody></refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure766.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevcsecure766.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure766.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure766.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,39 +17,34 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure766">
+<reference id="rdevcsecure766" xml:lang="en-us">
 <title>Programming the application to provide the user and password</title>
+<shortdesc>In the <i>DriverManager.getConnection</i> call, an application
+can provide the user name and password in the following ways.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>User names<indexterm>providing</indexterm></indexterm>
-<indexterm>Passwords<indexterm>providing</indexterm></indexterm>
-<indexterm>Passwords<indexterm>no encryption of</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>User names<indexterm>providing</indexterm></indexterm>
+<indexterm>Passwords<indexterm>providing</indexterm></indexterm><indexterm>Passwords<indexterm>no
+encryption of</indexterm></indexterm></keywords>
+</metadata></prolog>
 <refbody>
-<section><p>In the <i>DriverManager.getConnection</i> call, an application
-can provide the user name and password:</p></section><section>
-<ul>
-<li>Separately as arguments to the following signature of the method: <i>getConnection(String url, String user, String password)</i>  
-<codeblock>Connection conn = DriverManager.getConnection(
+<section> <ul>
+<li>Separately as arguments to the following signature of the method: <i>getConnection(String
+url, String user, String password)</i>   <codeblock>Connection conn = DriverManager.getConnection(
     "jdbc:derby:myDB", "mary", "little7xylamb");</codeblock></li>
-<li>As attributes to the database connection URL  
-<codeblock>Connection conn = DriverManager.getConnection(
+<li>As attributes to the database connection URL   <codeblock>Connection conn = DriverManager.getConnection(
     "jdbc:derby:myDB;user=mary;password=little7xylamb");</codeblock></li>
 <li>By setting the user and password properties in a Properties object as
-with other connection URL attributes  
-<codeblock>Properties p = new Properties();
+with other connection URL attributes   <codeblock>Properties p = new Properties();
 p.put("user", "mary");
 p.put("password", "little7xylamb");
 Connection conn = DriverManager.getConnection(
     "jdbc:derby:myDB", p);</codeblock></li>
-</ul></section><section>
-<note>The password is not encrypted. When you are using <ph conref="devconrefs.dita#prod/productshortname"></ph> in
+</ul></section>
+<section> <note>The password is not encrypted. When you are using <ph conref="devconrefs.dita#prod/productshortname"></ph> in
 the context of a server framework, the framework should be responsible for
 encrypting the password across the network. If your framework does not encrypt
 the password, consider using SSL. </note></section>
-<section><p>For information about the treatment of user names within the <ph conref="devconrefs.dita#prod/productshortname"></ph> system,
-see <xref href="cdevcsecure37241.dita#cdevcsecure37241"/>.</p></section>
-</refbody></reference>
+<section><p>For information about the treatment of user names within the <ph
+conref="devconrefs.dita#prod/productshortname"></ph> system, see <xref href="cdevcsecure37241.dita#cdevcsecure37241"></xref>.</p></section>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure935.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevcsecure935.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure935.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure935.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,14 +17,12 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevcsecure935">
+<reference id="rdevcsecure935" xml:lang="en-us">
 <title>Notes on user authorization</title>
-<prolog>
-</prolog>
-<refbody>
-<section><p>All the authorization properties are set for a connection when it is created.
-Changing any of the authorization properties does not affect existing connections.
-However, all future connections are affected by the change. </p></section>
-<section><p>For more information about authorization identifiers, see <xref href="cdevcsecure37241.dita#cdevcsecure37241"/>.</p></section>
-</refbody></reference>
+<shortdesc>All the authorization properties are set for a connection when
+it is created. Changing any of the authorization properties does not affect
+existing connections. However, all future connections are affected by the
+change. </shortdesc>
+<prolog></prolog>
+<refbody></refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevdeploy856845.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevdeploy856845.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevdeploy856845.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevdeploy856845.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,19 +17,18 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevdeploy856845">
+<reference id="rdevdeploy856845" xml:lang="en-us">
 <title>Installing jar files</title>
-<prolog>
-</prolog>
-<refbody><example>
-<codeblock><b><b>-- SQL  statement</b>
+<prolog></prolog>
+<refbody>
+<example> <codeblock><b>-- SQL  statement</b>
 CALL sqlj.install_jar(
     'tours.jar', 'APP.Sample1', 0)
 
 <b>-- SQL  statement
 -- using a quoted identifier for the 
--- <ph conref="devconrefs.dita#prod/productshortname"></ph>  jar name</b>
+-- Derby jar name</b>
 CALL sqlj.install_jar(
-    'tours.jar', 'APP."Sample2"', 0)</b></codeblock></example>
-</refbody></reference>
+    'tours.jar', 'APP."Sample2"', 0)</codeblock></example>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevdeploy856880.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevdeploy856880.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevdeploy856880.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevdeploy856880.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,13 +17,12 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevdeploy856880">
+<reference id="rdevdeploy856880" xml:lang="en-us">
 <title>Removing jar files</title>
-<prolog>
-</prolog>
-<refbody><example>
-<codeblock><b><b>-- SQL  statement</b>
+<prolog></prolog>
+<refbody>
+<example> <codeblock><b>-- SQL  statement</b>
 CALL sqlj.remove_jar(
-    'APP.Sample1', 0)</b></codeblock></example>
-</refbody></reference>
+    'APP.Sample1', 0)</codeblock></example>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevdeploy856912.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevdeploy856912.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevdeploy856912.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevdeploy856912.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,13 +17,12 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevdeploy856912">
+<reference id="rdevdeploy856912" xml:lang="en-us">
 <title>Replacing jar files</title>
-<prolog>
-</prolog>
-<refbody><example>
-<codeblock><b><b>-- SQL  statement</b>
+<prolog></prolog>
+<refbody>
+<example> <codeblock><b>-- SQL  statement</b>
 CALL sqlj.replace_jar(
-    'c:\myjarfiles\newtours.jar', 'APP.Sample1')</b></codeblock></example>
-</refbody></reference>
+    'c:\myjarfiles\newtours.jar', 'APP.Sample1')</codeblock></example>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevdvlp22102.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,60 +17,52 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevdvlp22102">
+<reference id="rdevdvlp22102" xml:lang="en-us">
 <title>Database connection examples</title>
+<shortdesc>The examples in this section use the syntax of the connection URL
+for use in an embedded environment.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Connecting to databases not directly in the system directory</indexterm>
+<keywords><indexterm>Connecting to databases not directly in the system directory</indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <refbody>
-<section><p/></section>
-<section><p>The examples in this section use the syntax of the connection URL for use in an
-embedded environment. This information also applies to the client connection URL in
-a client/server environment. For reference information about client connection URLs,
-see <i>"java.sql.Connection"</i> in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p></section><section>
-<ul>
-<li><i>jdbc:derby:db1</i>  
-<p>Open a connection to the database <i>db1</i>. <i>db1</i> is a directory located
-in the system directory.</p></li>
-<li><i>jdbc:derby:london/sales</i>  
-<p>Open a connection to
-the database <i>london/sales</i>. <i>london</i> is a subdirectory of the system directory, and <i>sales</i> is a subdirectory of the directory <i>london</i>.</p></li>
-<li><i>jdbc:derby:/reference/phrases/french</i>  
-<p>Open a
-connection to the database <i>/reference/phrases/french</i>.</p> 
-<p>On a UNIX system, this would be the path of the directory. On a Windows
-system, the path would be <i>C:\reference\phrases\french</i> if
-the current drive were <i>C. </i>If a jar file storing databases
-were in the user's classpath, this could also be a path within the jar
-file.</p></li>
-<li><i>jdbc:derby:a:/demo/sample</i>  
-<p>Open a connection
-to the database stored in the directory <i>\demo\sample</i> on
-drive <i>A</i> (usually the floppy drive) on a Windows system.</p></li>
-<li><i>jdbc:<ph conref="devconrefs.dita#prod/productlowercase"></ph>:c:/databases/salesdb jdbc:derby:salesdb</i>  
-<p>These two connection URLs connect to the same database, <i>salesdb</i>, on a Windows platform if the system directory of the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
-is <i>C:\databases</i>.</p></li>
-<li><i>jdbc:derby:support/bugsdb;create=true</i>  
-<p>Create
-the database <i>support/bugsdb</i> in the system directory,
-automatically creating the intermediate directory <i>support</i> if it does not exist.</p></li>
-<li><i>jdbc:derby:sample;shutdown=true</i>  
-<p>Shut down the <i>sample</i> database.</p></li>
-<li><i>jdbc:derby:/myDB</i>  
-<p>Access <i>myDB</i> (which is directly in a directory in the classpath) as a read-only
-database.</p></li>
-<li><i>jdbc:derby:classpath:/myDB</i>  
-<p>Access <i>myDB</i> (which is directly in a directory in the classpath) as a read-only
-database. The reason for using the subsubprotocol is that it might  have the
-same path as a database in the directory structure.</p></li>
-<li><i>jdbc:derby:jar:(C:/dbs.jar)products/boiledfood</i>  
-<p>Access the read-only database <i>boiledfood</i> in the <i>products</i> directory from the jar file <i>C:/dbs.jar</i>.</p></li>
-<li><i>jdbc:derby:directory:myDB</i>  
-<p>Access <i>myDB</i>, which is in the system directory. The reason for using the <codeph><i>directory:</i></codeph> subsubprotocol is that it might happen
-to have the same path as a database in the classpath.</p></li>
+<section><p>This information also applies to the client connection URL in
+a client/server environment. For reference information about client connection
+URLs, see <i>"java.sql.Connection"</i> in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p></section>
+<section> <ul>
+<li><i>jdbc:derby:db1</i>   <p>Open a connection to the database <i>db1</i>. <i>db1</i> is
+a directory located in the system directory.</p></li>
+<li><i>jdbc:derby:london/sales</i>   <p>Open a connection to the database <i>london/sales</i>. <i>london</i> is
+a subdirectory of the system directory, and <i>sales</i> is a subdirectory
+of the directory <i>london</i>.</p></li>
+<li><i>jdbc:derby:/reference/phrases/french</i>   <p>Open a connection to
+the database <i>/reference/phrases/french</i>.</p>  <p>On a UNIX system, this
+would be the path of the directory. On a Windows system, the path would be <i>C:\reference\phrases\french</i> if
+the current drive were <i>C. </i>If a jar file storing databases were in the
+user's classpath, this could also be a path within the jar file.</p></li>
+<li><i>jdbc:derby:a:/demo/sample</i>   <p>Open a connection to the database
+stored in the directory <i>\demo\sample</i> on drive <i>A</i> (usually the
+floppy drive) on a Windows system.</p></li>
+<li><i>jdbc:<ph conref="devconrefs.dita#prod/productlowercase"></ph>:c:/databases/salesdb
+jdbc:derby:salesdb</i>   <p>These two connection URLs connect to the same
+database, <i>salesdb</i>, on a Windows platform if the system directory of
+the <ph conref="devconrefs.dita#prod/productshortname"></ph> system is <i>C:\databases</i>.</p></li>
+<li><i>jdbc:derby:support/bugsdb;create=true</i>   <p>Create the database <i>support/bugsdb</i> in
+the system directory, automatically creating the intermediate directory <i>support</i> if
+it does not exist.</p></li>
+<li><i>jdbc:derby:sample;shutdown=true</i>   <p>Shut down the <i>sample</i> database.</p></li>
+<li><i>jdbc:derby:/myDB</i>   <p>Access <i>myDB</i> (which is directly in
+a directory in the classpath) as a read-only database.</p></li>
+<li><i>jdbc:derby:classpath:/myDB</i>   <p>Access <i>myDB</i> (which is directly
+in a directory in the classpath) as a read-only database. The reason for using
+the subsubprotocol is that it might  have the same path as a database in the
+directory structure.</p></li>
+<li><i>jdbc:derby:jar:(C:/dbs.jar)products/boiledfood</i>   <p>Access the
+read-only database <i>boiledfood</i> in the <i>products</i> directory from
+the jar file <i>C:/dbs.jar</i>.</p></li>
+<li><i>jdbc:derby:directory:myDB</i>   <p>Access <i>myDB</i>, which is in
+the system directory. The reason for using the <codeph><i>directory:</i></codeph> subsubprotocol
+is that it might happen to have the same path as a database in the classpath.</p></li>
 </ul></section>
-</refbody></reference>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevdvlp38881.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevdvlp38881.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevdvlp38881.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevdvlp38881.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,50 +17,43 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevdvlp38881">
+<reference id="rdevdvlp38881" xml:lang="en-us">
 <title>Embedded Derby JDBC database connection URL</title>
+<shortdesc>This is the standard <ph conref="devconrefs.dita#prod/productshortname"></ph> JDBC
+connection URL, which you can use for tasks besides connecting to a database.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Database connection URL<indexterm>syntax</indexterm></indexterm>
-<indexterm>Subprotocol<indexterm>part of database connection
-URL syntax</indexterm></indexterm>
-<indexterm>Subsubprotocol<indexterm>part of database connection
-URL syntax</indexterm></indexterm>
-<indexterm>directory subsubprotocol</indexterm>
-<indexterm>classpath subsubprotocol</indexterm>
-<indexterm>jar subsubprotocol</indexterm>
-<indexterm>Database connection URL<indexterm>using</indexterm></indexterm>
+<keywords><indexterm>Database connection URL<indexterm>syntax</indexterm></indexterm>
+<indexterm>Subprotocol<indexterm>part of database connection URL syntax</indexterm></indexterm>
+<indexterm>Subsubprotocol<indexterm>part of database connection URL syntax</indexterm></indexterm>
+<indexterm>directory subsubprotocol</indexterm><indexterm>classpath subsubprotocol</indexterm>
+<indexterm>jar subsubprotocol</indexterm><indexterm>Database connection URL<indexterm>using</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <refbody>
-<section><p>The standard <ph conref="devconrefs.dita#prod/productshortname"></ph> JDBC connection URL, which you can use for tasks besides
-connecting to a database, is</p></section><example>
-<codeblock>jdbc:derby:[subsubprotocol:][<i>databaseName</i>][;<i>attribute</i>=<i>value</i>]*</codeblock></example>
-<section><p><i>Subsubprotocol</i>, which is not typically specified,
-determines how <ph conref="devconrefs.dita#prod/productshortname"></ph> looks for a database: in a directory, in a class
-path, or in a jar file. Subsubprotocol is one of the following:</p></section><section>
-<ul>
-<li><i>directory</i> The default. Specify this explicitly
-only to distinguish a database that might be ambiguous with one on the class
-path.</li>
-<li><i>classpath</i> Databases are treated as read-only databases,
-and all <i>databaseNames</i> must begin with at least a slash,
-because you specify them "relative" to the classpath directory.</li>
-<li><i>jar</i> Databases are treated as read-only databases. <i>DatabaseNames</i> might require a leading slash, because you
-specify them "relative" to the jar file.</li>
+<example> <codeblock>jdbc:derby:[subsubprotocol:][<i>databaseName</i>][;<i>attribute</i>=<i>value</i>]*</codeblock></example>
+<section><p><i>Subsubprotocol</i>, which is not typically specified, determines
+how <ph conref="devconrefs.dita#prod/productshortname"></ph> looks for a database:
+in a directory, in a class path, or in a jar file. Subsubprotocol is one of
+the following:</p></section>
+<section> <ul>
+<li><i>directory</i> The default. Specify this explicitly only to distinguish
+a database that might be ambiguous with one on the class path.</li>
+<li><i>classpath</i> Databases are treated as read-only databases, and all <i>databaseNames</i> must
+begin with at least a slash, because you specify them "relative" to the classpath
+directory.</li>
+<li><i>jar</i> Databases are treated as read-only databases. <i>DatabaseNames</i> might
+require a leading slash, because you specify them "relative" to the jar file.</li>
 </ul></section>
-<section><p><i>jar</i> requires an additional element immediately
-before the database name:</p></section><example>
-<codeblock>(<i>pathToArchive</i>)</codeblock></example>
-<section><p><i>pathToArchive</i> is the path to the jar or zip file
-that holds the database.</p></section>
-<section><p>For examples of using this syntax, see <xref href="cdevdeploy11201.dita#cdevdeploy11201"/>.</p></section>
-<section><p>You typically pass the connection URL as an argument to the JDBC <i>DriverManager.getConnection</i> method call. For example:</p></section><example>
-<codeblock>
-DriverManager.getConnection("jdbc:derby:sample");
-</codeblock></example>
-<section><p>You can specify attributes and attribute values to a connection URL. For more information
-about what you can specify with the <ph conref="devconrefs.dita#prod/productshortname"></ph> connection URL, see <xref href="rdevdvlp22102.dita#rdevdvlp22102"/>. For detailed reference about attributes and values, see the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p></section>
-</refbody></reference>
+<section><p><i>jar</i> requires an additional element immediately before the
+database name:</p></section>
+<example> <codeblock>(<i>pathToArchive</i>)</codeblock></example>
+<section><p><i>pathToArchive</i> is the path to the jar or zip file that holds
+the database.</p></section>
+<section><p>You typically pass the connection URL as an argument to the JDBC <i>DriverManager.getConnection</i> method
+call. For example:</p></section>
+<example> <codeblock>DriverManager.getConnection("jdbc:derby:sample");</codeblock></example>
+<section><p>You can specify attributes and attribute values to a connection
+URL. For detailed reference about attributes and values, see the <cite><ph
+conref="devconrefs.dita#pub/citref"></ph></cite>.</p></section>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevdvlp847152.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevdvlp847152.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevdvlp847152.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevdvlp847152.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,30 +17,23 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevdvlp847152">
+<reference id="rdevdvlp847152" xml:lang="en-us">
 <title>Using the databaseName attribute</title>
+<shortdesc>You can use a databaseName attribute on a database connection URL
+to specify the name of the database to which you want to connect.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Database name attribute<indexterm>use of in database
-connection URL</indexterm></indexterm>
-<indexterm>Read-only databases<indexterm>accessing</indexterm></indexterm>
-<indexterm>Subsubprotocol<indexterm>part of database connection
-URL syntax</indexterm></indexterm>
+<keywords><indexterm>Database name attribute<indexterm>use of in database
+connection URL</indexterm></indexterm><indexterm>Read-only databases<indexterm>accessing</indexterm></indexterm>
+<indexterm>Subsubprotocol<indexterm>part of database connection URL syntax</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
-<refbody><example>
-<codeblock>
-jdbc:derby:;databaseName=<i>databaseName</i>
-</codeblock></example>
-<section><p>You can access read-only databases in jar or zip files by specifying jar
-as the subsubprotocol, like this:</p></section><example>
-<codeblock>
-jdbc:derby:jar:(<i>pathToArchive</i>)<i>databasePathWithinArchive</i>
-</codeblock></example>
-<section><p>Or, if the jar or zip file has been included in the classpath, like this:</p></section><example>
-<codeblock>
-jdbc:derby:/<i>databasePathWithinArchive</i>
-</codeblock></example>
-</refbody></reference>
+</metadata></prolog>
+<refbody>
+<example> <codeblock>jdbc:derby:;databaseName=<i>databaseName</i></codeblock></example>
+<section><p>You can access read-only databases in jar or zip files by specifying <codeph>jar</codeph> as
+the subsubprotocol, like this:</p></section>
+<example> <codeblock>jdbc:derby:jar:(<i>pathToArchive</i>)<i>databasePathWithinArchive</i></codeblock></example>
+<section><p>Or, if the jar or zip file has been included in the classpath,
+like this:</p></section>
+<example> <codeblock>jdbc:derby:/<i>databasePathWithinArchive</i></codeblock></example>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevexudclass.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevexudclass.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevexudclass.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevexudclass.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,14 +17,12 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevexudclass">
+<reference id="rdevexudclass" xml:lang="en-us">
 <title>Example of setting a user-defined class</title>
-<prolog>
-</prolog>
+<shortdesc>A very simple example of a class that implements the <i>org.apache.derby.authentication</i> interface.</shortdesc>
+<prolog></prolog>
 <refbody>
-<section><p>A very simple example of a class that implements the <i>org.apache.derby.authentication</i> interface:</p></section><example>
-<codeblock>import org.apache.derby.authentication.UserAuthenticator;
+<example> <codeblock>import org.apache.derby.authentication.UserAuthenticator;
 import java.io.FileInputStream;
 import java.util.Properties;
 import java.sql.SQLException;
@@ -143,4 +144,5 @@
        return true;
     }
 }</codeblock></example>
-</refbody></reference>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevprocsqle.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevprocsqle.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevprocsqle.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevprocsqle.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,17 +17,16 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevprocsqle">
+<reference id="rdevprocsqle" xml:lang="en-us">
 <title>Example of processing SQLExceptions</title>
-<prolog>
-</prolog>
+<shortdesc>A single error can generate more than one <i>SQLException</i>.
+Use a loop and the <codeph><i>getNextException</i></codeph> method to process
+all <codeph><i>SQLExceptions</i></codeph> in the chain. In many cases, the
+second exception in the chain is the pertinent one.</shortdesc>
+<prolog></prolog>
 <refbody>
-<section><p>In addition, a single error can generate more than one <i>SQLException</i>. Use a loop and the <codeph><i>getNextException</i></codeph> method to process all <codeph><i>SQLExceptions</i></codeph> in
-the chain. In many cases, the second exception in the chain is the pertinent
-one.</p></section>
-<section><p>The following is an example:</p></section><example>
-<codeblock>catch (Throwable e) {
+<section><p>The following is an example:</p></section>
+<example> <codeblock>catch (Throwable e) {
     System.out.println("exception thrown:");
     errorPrint(e);
 }
@@ -44,5 +46,7 @@
         sqle = sqle.getNextException();
     }
 }</codeblock></example>
-<section><p>See also "<ph conref="devconrefs.dita#prod/productshortname"></ph> Exception Messages and SQL States", in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p></section>
-</refbody></reference>
+<section><p>See also "<ph conref="devconrefs.dita#prod/productshortname"></ph> Exception
+Messages and SQL States", in the <cite><ph conref="devconrefs.dita#pub/citref"></ph></cite>.</p></section>
+</refbody>
+</reference>

Modified: db/derby/docs/trunk/src/devguide/rdevresman79556.dita
URL: http://svn.apache.org/viewcvs/db/derby/docs/trunk/src/devguide/rdevresman79556.dita?rev=386714&r1=386713&r2=386714&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevresman79556.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevresman79556.dita Fri Mar 17 13:11:50 2006
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,27 +17,22 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevresman79556">
+<reference id="rdevresman79556" xml:lang="en-us">
 <title>Classes that pertain to resource managers</title>
+<shortdesc>See the javadoc for each class for more information.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>EmbeddedDataSource</indexterm>
-<indexterm>EmbeddedConnectionPoolDataSource</indexterm>
-<indexterm>EmbeddedXADataSource</indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>EmbeddedDataSource</indexterm><indexterm>EmbeddedConnectionPoolDataSource</indexterm>
+<indexterm>EmbeddedXADataSource</indexterm></keywords>
+</metadata></prolog>
 <refbody>
-<section><p>See the javadoc for each class for more information.</p></section><section>
-<ul>
-<li><i>org.apache.derby.jdbc.EmbeddedDataSource</i><i/>  
-<p>Implements <i>javax.sql.DataSource</i> interface, which a
-JNDI server can reference. Typically this is the object that you work with
-as a <codeph><i>DataSource</i></codeph>.</p></li>
-<li><i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</i>  
-<p>Implements <i>javax.sql.ConnectionPoolDataSource</i>. A factory for <codeph><i>PooledConnection</i></codeph> objects.</p></li>
-<li><i>org.apache.derby.jdbc.EmbeddedXADataSource</i><i/>  
-<p><ph conref="devconrefs.dita#prod/productshortname"></ph>'s implementation of a <i>javax.sql.XADataSource</i>.</p></li>
+<section> <ul>
+<li><i>org.apache.derby.jdbc.EmbeddedDataSource</i><i></i>   <p>Implements <i>javax.sql.DataSource</i> interface,
+which a JNDI server can reference. Typically this is the object that you work
+with as a <codeph><i>DataSource</i></codeph>.</p></li>
+<li><i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</i>   <p>Implements <i>javax.sql.ConnectionPoolDataSource</i>.
+A factory for <codeph><i>PooledConnection</i></codeph> objects.</p></li>
+<li><i>org.apache.derby.jdbc.EmbeddedXADataSource</i><i></i>   <p><ph conref="devconrefs.dita#prod/productshortname"></ph>'s
+implementation of a <i>javax.sql.XADataSource</i>.</p></li>
 </ul></section>
-</refbody></reference>
+</refbody>
+</reference>



Mime
View raw message