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 [11/17] - in incubator/derby/docs/trunk/src: adminguide/ devguide/ getstart/ tuning/
Date Thu, 31 Mar 2005 00:27:29 GMT
Modified: incubator/derby/docs/trunk/src/devguide/rdevdeploy856912.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdeploy856912.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdeploy856912.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdeploy856912.dita Wed Mar 30 16:26:36 2005
@@ -1,26 +1,26 @@
-<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevdeploy856912">
-<title>Replacing jar files</title>
-<prolog>
-</prolog>
-<refbody><example>
-<codeblock><b><b>-- SQL  statement</b>
-CALL sqlj.replace_jar(
-    'c:\myjarfiles\newtours.jar', 'APP.Sample1')</b></codeblock></example>
-</refbody></reference>
+<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
+<reference xml:lang="en-us" id="rdevdeploy856912">
+<title>Replacing jar files</title>
+<prolog>
+</prolog>
+<refbody><example>
+<codeblock><b><b>-- SQL  statement</b>
+CALL sqlj.replace_jar(
+    'c:\myjarfiles\newtours.jar', 'APP.Sample1')</b></codeblock></example>
+</refbody></reference>

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

Modified: incubator/derby/docs/trunk/src/devguide/rdevdeploy856948.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdeploy856948.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdeploy856948.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdeploy856948.dita Wed Mar 30 16:26:36 2005
@@ -1,25 +1,25 @@
-<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevdeploy856948">
-<title>Jar file examples</title>
-<prolog>
-</prolog>
-<refbody>
-<section><p>See the <cite><ph conref="devconrefs.dita#pub/citutilities"></ph></cite> for reference information about
-the utility and complete syntax.</p></section>
-</refbody></reference>
+<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
+<reference xml:lang="en-us" id="rdevdeploy856948">
+<title>Jar file examples</title>
+<prolog>
+</prolog>
+<refbody>
+<section><p>See the <cite><ph conref="devconrefs.dita#pub/citutilities"></ph></cite> for reference information about
+the utility and complete syntax.</p></section>
+</refbody></reference>

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

Modified: incubator/derby/docs/trunk/src/devguide/rdevdvlp22102.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdvlp22102.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdvlp22102.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdvlp22102.dita Wed Mar 30 16:26:36 2005
@@ -1,73 +1,73 @@
-<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevdvlp22102">
-<title>Database connection examples</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Connecting to databases not directly in the system directory</indexterm>
-</keywords>
-</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 class path, 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 class path) 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 class path) 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 class path.</p></li>
-</ul></section>
-</refbody></reference>
+<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
+<reference xml:lang="en-us" id="rdevdvlp22102">
+<title>Database connection examples</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Connecting to databases not directly in the system directory</indexterm>
+</keywords>
+</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 class path, 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 class path) 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 class path) 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 class path.</p></li>
+</ul></section>
+</refbody></reference>

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

Modified: incubator/derby/docs/trunk/src/devguide/rdevdvlp38881.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdvlp38881.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdvlp38881.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdvlp38881.dita Wed Mar 30 16:26:36 2005
@@ -1,64 +1,64 @@
-<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevdvlp38881">
-<title>Embedded Derby JDBC database connection URL</title>
-<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>
-</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><ph conref="devconrefs.dita#prod/productshortname"></ph></i> is always the <i>subprotocol</i> for connecting to a <ph conref="devconrefs.dita#prod/productshortname"></ph> database.</p></section>
-<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 class path 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>
+<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
+<reference xml:lang="en-us" id="rdevdvlp38881">
+<title>Embedded Derby JDBC database connection URL</title>
+<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>
+</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><ph conref="devconrefs.dita#prod/productshortname"></ph></i> is always the <i>subprotocol</i> for connecting to a <ph conref="devconrefs.dita#prod/productshortname"></ph> database.</p></section>
+<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 class path 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>

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

Modified: incubator/derby/docs/trunk/src/devguide/rdevdvlp847152.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevdvlp847152.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevdvlp847152.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevdvlp847152.dita Wed Mar 30 16:26:36 2005
@@ -1,43 +1,43 @@
-<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevdvlp847152">
-<title>Using the databaseName attribute</title>
-<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>
-</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 class path, like this:</p></section><example>
-<codeblock>
-jdbc:derby:/<i>databasePathWithinArchive</i>
-</codeblock></example>
-</refbody></reference>
+<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
+<reference xml:lang="en-us" id="rdevdvlp847152">
+<title>Using the databaseName attribute</title>
+<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>
+</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 class path, like this:</p></section><example>
+<codeblock>
+jdbc:derby:/<i>databasePathWithinArchive</i>
+</codeblock></example>
+</refbody></reference>

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

Modified: incubator/derby/docs/trunk/src/devguide/rdevexudclass.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevexudclass.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevexudclass.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevexudclass.dita Wed Mar 30 16:26:36 2005
@@ -1,146 +1,146 @@
-<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevexudclass">
-<title>Example of setting a user-defined class</title>
-<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;
-import java.io.FileInputStream;
-import java.util.Properties;
-import java.sql.SQLException;
-<b>/**
-  * A simple example of a specialized Authentication scheme.
-  * The system property 'derby.connection.requireAuthentication'
-  * must be set
-  * to true and 'derby.connection.specificAuthentication' must
-  * contain the full class name of the overriden authentication
-  * scheme,  i.e., the name of this class.
-  *
-  * @see org.apache.derby.authentication.UserAuthenticator 
-  */</b>
-
-public class MyAuthenticationSchemeImpl implements
-UserAuthenticator {
-    private static final String USERS_CONFIG_FILE = "myUsers.cfg";
-    private static Properties usersConfig;
-
-   <b> // Constructor
-    // We get passed some Users properties if the 
-    //authentication service could not set them as 
-    //part of System properties.
-    //</b>
-    public MyAuthenticationSchemeImpl() {
-    }
-<b>    /* static block where we load the users definition from a
-users configuration file.*/</b>
-
-    static {
-<b>       /* load users config file as Java properties
-        File must be in the same directory where
-        <ph conref="devconrefs.dita#prod/productshortname"></ph>  gets started.
-       (otherwise full path must be specified) */</b>
-       FileInputStream in = null;
-       usersConfig = new Properties();
-       try {
-           in = new FileInputStream(USERS_CONFIG_FILE);
-           usersConfig.load(in);
-           in.close();
-       } catch (java.io.IOException ie) {
-           // No Config file. Raise error message
-           System.err.println(
-             "WARNING: Error during Users Config file
-retrieval");
-           System.err.println("Exception: " + ie);
-       }
-    }
-<b>    /**
-     * Authenticate the passed-in user's credentials.
-     * A more complex class could make calls
-     * to any external users directory.
-     *
-     * @param userName               The user's name
-     * @param userPassword           The user's password 
-     * @param databaseName           The database 
-     * @param infoAdditional jdbc connection info.
-     * @exception SQLException on failure
-     */</b>
-    public boolean authenticateUser(String userName,
-     String userPassword,
-     String databaseName,
-     Properties info)
-       throws SQLException 
-    {
- <b>      /* Specific Authentication scheme logic.
-        If user has been authenticated, then simply return.
-        If user name and/or password are invalid, 
-        then raise the appropriate exception.
-            
-       This example allows only users defined in the
-       users config properties object.
-
-       Check if the passed-in user has been defined for the system.
-       We expect to find and match the property corresponding to
-       the credentials passed in. */</b>
-       if (userName == null)
-          <b> // We do not tolerate 'guest' user for now.
-       </b>    return false;
-<b>       //
-       // Check if user exists in our users config (file)
-       // properties set.
-       // If we did not find the user in the users config set, then
-       // try to find if the user is defined as a System property.
-       //</b>
-       String actualUserPassword;
-       actualUserPassword = usersConfig.getProperty(userName);
-       if (actualUserPassword == null)
-           actualUserPassword = System.getProperty(userName);
-       if (actualUserPassword == null)
-            <b>// no such passed-in user found</b>
-            return false;
-            <b>// check if the password matches</b>
-       if (!actualUserPassword.equals(userPassword))
-       return false;
-       <b>// Now, check if the user is a valid user of the database</b>
-       if (databaseName != null)
-       {
-             <b>/* if database users restriction lists present, then check 
-            if there is one for this database and if so, 
-            check if the user is a valid one of that database.
-            For this example, the only user we authorize in database
-            DarkSide is user 'DarthVader'. This is the only database
-            users restriction list we have for this example.
-            We authorize any valid (login) user to access the
-            OTHER databases in the system.
-            Note that database users ACLs could be set in the same
-            properties file or a separate one and implemented as you
-            wish. */</b>
-            <b>//</b>
-           if (databaseName.equals("DarkSide")) {
-              <b>// check if user is a valid one.</b>
-              if (!userName.equals("DarthVader"))
-                  <b>// This user is not a valid one of the passed-in</b>
-                  return false;
-           }
-       }
-       <b>// The user is a valid one in this database</b>
-       return true;
-    }
-}</codeblock></example>
-</refbody></reference>
+<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
+<reference xml:lang="en-us" id="rdevexudclass">
+<title>Example of setting a user-defined class</title>
+<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;
+import java.io.FileInputStream;
+import java.util.Properties;
+import java.sql.SQLException;
+<b>/**
+  * A simple example of a specialized Authentication scheme.
+  * The system property 'derby.connection.requireAuthentication'
+  * must be set
+  * to true and 'derby.connection.specificAuthentication' must
+  * contain the full class name of the overriden authentication
+  * scheme,  i.e., the name of this class.
+  *
+  * @see org.apache.derby.authentication.UserAuthenticator 
+  */</b>
+
+public class MyAuthenticationSchemeImpl implements
+UserAuthenticator {
+    private static final String USERS_CONFIG_FILE = "myUsers.cfg";
+    private static Properties usersConfig;
+
+   <b> // Constructor
+    // We get passed some Users properties if the 
+    //authentication service could not set them as 
+    //part of System properties.
+    //</b>
+    public MyAuthenticationSchemeImpl() {
+    }
+<b>    /* static block where we load the users definition from a
+users configuration file.*/</b>
+
+    static {
+<b>       /* load users config file as Java properties
+        File must be in the same directory where
+        <ph conref="devconrefs.dita#prod/productshortname"></ph>  gets started.
+       (otherwise full path must be specified) */</b>
+       FileInputStream in = null;
+       usersConfig = new Properties();
+       try {
+           in = new FileInputStream(USERS_CONFIG_FILE);
+           usersConfig.load(in);
+           in.close();
+       } catch (java.io.IOException ie) {
+           // No Config file. Raise error message
+           System.err.println(
+             "WARNING: Error during Users Config file
+retrieval");
+           System.err.println("Exception: " + ie);
+       }
+    }
+<b>    /**
+     * Authenticate the passed-in user's credentials.
+     * A more complex class could make calls
+     * to any external users directory.
+     *
+     * @param userName               The user's name
+     * @param userPassword           The user's password 
+     * @param databaseName           The database 
+     * @param infoAdditional jdbc connection info.
+     * @exception SQLException on failure
+     */</b>
+    public boolean authenticateUser(String userName,
+     String userPassword,
+     String databaseName,
+     Properties info)
+       throws SQLException 
+    {
+ <b>      /* Specific Authentication scheme logic.
+        If user has been authenticated, then simply return.
+        If user name and/or password are invalid, 
+        then raise the appropriate exception.
+            
+       This example allows only users defined in the
+       users config properties object.
+
+       Check if the passed-in user has been defined for the system.
+       We expect to find and match the property corresponding to
+       the credentials passed in. */</b>
+       if (userName == null)
+          <b> // We do not tolerate 'guest' user for now.
+       </b>    return false;
+<b>       //
+       // Check if user exists in our users config (file)
+       // properties set.
+       // If we did not find the user in the users config set, then
+       // try to find if the user is defined as a System property.
+       //</b>
+       String actualUserPassword;
+       actualUserPassword = usersConfig.getProperty(userName);
+       if (actualUserPassword == null)
+           actualUserPassword = System.getProperty(userName);
+       if (actualUserPassword == null)
+            <b>// no such passed-in user found</b>
+            return false;
+            <b>// check if the password matches</b>
+       if (!actualUserPassword.equals(userPassword))
+       return false;
+       <b>// Now, check if the user is a valid user of the database</b>
+       if (databaseName != null)
+       {
+             <b>/* if database users restriction lists present, then check 
+            if there is one for this database and if so, 
+            check if the user is a valid one of that database.
+            For this example, the only user we authorize in database
+            DarkSide is user 'DarthVader'. This is the only database
+            users restriction list we have for this example.
+            We authorize any valid (login) user to access the
+            OTHER databases in the system.
+            Note that database users ACLs could be set in the same
+            properties file or a separate one and implemented as you
+            wish. */</b>
+            <b>//</b>
+           if (databaseName.equals("DarkSide")) {
+              <b>// check if user is a valid one.</b>
+              if (!userName.equals("DarthVader"))
+                  <b>// This user is not a valid one of the passed-in</b>
+                  return false;
+           }
+       }
+       <b>// The user is a valid one in this database</b>
+       return true;
+    }
+}</codeblock></example>
+</refbody></reference>

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

Modified: incubator/derby/docs/trunk/src/devguide/rdevprocsqle.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevprocsqle.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevprocsqle.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevprocsqle.dita Wed Mar 30 16:26:36 2005
@@ -1,48 +1,48 @@
-<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevprocsqle">
-<title>Example of processing SQLExceptions</title>
-<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) {
-    System.out.println("exception thrown:");
-    errorPrint(e);
-}
-static void errorPrint(Throwable e) {
-    if (e instanceof SQLException) 
-        SQLExceptionPrint((SQLException)e);
-    else
-        System.out.println("A non-SQL error: " + e.toString());
-}
-static void SQLExceptionPrint(SQLException sqle) {
-    while (sqle != null) {
-        System.out.println("\n---SQLException Caught---\n");
-        System.out.println("SQLState:   " + (sqle).getSQLState());
-        System.out.println("Severity: " + (sqle).getErrorCode());
-        System.out.println("Message:  " + (sqle).getMessage()); 
-        sqle.printStackTrace();  
-        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>
+<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
+<reference xml:lang="en-us" id="rdevprocsqle">
+<title>Example of processing SQLExceptions</title>
+<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) {
+    System.out.println("exception thrown:");
+    errorPrint(e);
+}
+static void errorPrint(Throwable e) {
+    if (e instanceof SQLException) 
+        SQLExceptionPrint((SQLException)e);
+    else
+        System.out.println("A non-SQL error: " + e.toString());
+}
+static void SQLExceptionPrint(SQLException sqle) {
+    while (sqle != null) {
+        System.out.println("\n---SQLException Caught---\n");
+        System.out.println("SQLState:   " + (sqle).getSQLState());
+        System.out.println("Severity: " + (sqle).getErrorCode());
+        System.out.println("Message:  " + (sqle).getMessage()); 
+        sqle.printStackTrace();  
+        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>

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

Modified: incubator/derby/docs/trunk/src/devguide/rdevresman79556.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevresman79556.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevresman79556.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevresman79556.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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
-<reference xml:lang="en-us" id="rdevresman79556">
-<title>Classes that pertain to resource managers</title>
-<prolog><metadata>
-<keywords>
-<indexterm>org.apache.derby.jdbc.EmbeddedDataSource</indexterm>
-<indexterm>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</indexterm>
-<indexterm>org.apache.derby.jdbc.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>
-</ul></section>
-</refbody></reference>
+<?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 reference PUBLIC "-//IBM//DTD DITA Reference//EN" "../dtd/reference.dtd">
+<reference xml:lang="en-us" id="rdevresman79556">
+<title>Classes that pertain to resource managers</title>
+<prolog><metadata>
+<keywords>
+<indexterm>org.apache.derby.jdbc.EmbeddedDataSource</indexterm>
+<indexterm>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</indexterm>
+<indexterm>org.apache.derby.jdbc.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>
+</ul></section>
+</refbody></reference>

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

Modified: incubator/derby/docs/trunk/src/devguide/rdevtrademderby.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/rdevtrademderby.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/rdevtrademderby.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/rdevtrademderby.dita Wed Mar 30 16:26:36 2005
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE topic PUBLIC "-//IBM//DTD DITA Topic//EN"
- "../dtd/topic.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.
--->
-<?Pub Caret?>
-<topic id="rdevtrademderby" xml:lang="en-us">
-<title>Trademarks</title>
-<body>
-<p>The following terms are trademarks of International Business Machines Corporation
-in the United States, other countries, or both, and have been used in at least
-one of the documents in the DB2 UDB documentation library.</p>
-<table colsep="0" expanse="column" frame="none">
-<tgroup cols="2">
-<tbody>
-<row>
-<entry><lines>Cloudscape
-DB2
-DB2 Universal Database
-</lines></entry>
-<entry> <lines>DRDA
-IBM
-WebSphere</lines></entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-<p>The following terms are trademarks or registered trademarks of other companies
-and have been used in at least one of the documents in the <ph conref="devconrefs.dita#prod/productlongname"></ph> documentation
-library:</p>
-<p>Microsoft, Windows, Windows NT, and the Windows logo are trademarks of
-Microsoft Corporation in the United States, other countries, or both. </p>
-<p>Java and all Java-based trademarks are trademarks of Sun Microsystems,
-Inc. in the United States, other countries, or both.</p>
-<p>UNIX is a registered trademark of The Open Group in the United States and
-other countries.</p>
-<p>Other company, product, or service names may be trademarks or service marks
-of others.</p>
-</body>
-</topic>
-<?Pub *0000002084?>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE topic PUBLIC "-//IBM//DTD DITA Topic//EN"
+ "../dtd/topic.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.
+-->
+<?Pub Caret?>
+<topic id="rdevtrademderby" xml:lang="en-us">
+<title>Trademarks</title>
+<body>
+<p>The following terms are trademarks of International Business Machines Corporation
+in the United States, other countries, or both, and have been used in at least
+one of the documents in the DB2 UDB documentation library.</p>
+<table colsep="0" expanse="column" frame="none">
+<tgroup cols="2">
+<tbody>
+<row>
+<entry><lines>Cloudscape
+DB2
+DB2 Universal Database
+</lines></entry>
+<entry> <lines>DRDA
+IBM
+WebSphere</lines></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<p>The following terms are trademarks or registered trademarks of other companies
+and have been used in at least one of the documents in the <ph conref="devconrefs.dita#prod/productlongname"></ph> documentation
+library:</p>
+<p>Microsoft, Windows, Windows NT, and the Windows logo are trademarks of
+Microsoft Corporation in the United States, other countries, or both. </p>
+<p>Java and all Java-based trademarks are trademarks of Sun Microsystems,
+Inc. in the United States, other countries, or both.</p>
+<p>UNIX is a registered trademark of The Open Group in the United States and
+other countries.</p>
+<p>Other company, product, or service names may be trademarks or service marks
+of others.</p>
+</body>
+</topic>
+<?Pub *0000002084?>

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

Modified: incubator/derby/docs/trunk/src/devguide/tdevconcepts41704.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevconcepts41704.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevconcepts41704.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevconcepts41704.dita Wed Mar 30 16:26:36 2005
@@ -1,50 +1,50 @@
-<?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 task PUBLIC "-//IBM//DTD DITA Task//EN"
- "../dtd/task.dtd">
-<task id="tdevconcepts41704" xml:lang="en-us">
-<title>Naming or accessing the name of a cursor</title>
-<prolog><metadata>
-<keywords><indexterm>Cursors<indexterm>naming</indexterm></indexterm><indexterm>Cursors<indexterm>accessing
-system-generated names</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody>
-<context> <p>There is no SQL language command to <i>assign</i> a name to a
-cursor. You can use the JDBC <codeph><i>setCursorName</i></codeph> method
-to assign a name to a <codeph><i>ResultSet</i></codeph> that allows positioned
-updates and deletes. You assign a name to a <codeph><i>ResultSet</i></codeph> with
-the <codeph><i>setCursorName</i></codeph> method of the <codeph><i>Statement</i></codeph> interface.
-You assign the name to a cursor before executing the <codeph><i>Statement</i></codeph> that
-will generate it.</p><codeblock>Statement s3 = conn.createStatement();
-<b>// name the statement so we can reference the result set
-// it generates</b>
-s3.setCursorName("UPDATABLESTATEMENT");
-<b>// we will be able to use the following statement later
-//to access the current row of the cursor</b>
-PreparedStatement ps2 = conn.prepareStatement(
-     "UPDATE FlightBookings SET number_seats = ? " +
-        "WHERE CURRENT OF UPDATABLESTATEMENT");</codeblock><p>Typically, you
-do not assign a name to the cursor, but let the system generate one for you
-automatically. You can determine the system-generated cursor name of a <i>ResultSet</i> generated
-by a SELECT statement using the <codeph><i>ResultSet</i></codeph> class's <codeph><i>getCursorName</i></codeph> method.</p><?Pub Caret?><codeblock
->PreparedStatement ps2 = conn.prepareStatement(
-    "UPDATE employee SET bonus = ? WHERE CURRENT OF "+
-        Updatable.getCursorName());</codeblock></context>
-</taskbody>
-</task>
-<?Pub *0000001970?>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN"
+ "../dtd/task.dtd">
+<task id="tdevconcepts41704" xml:lang="en-us">
+<title>Naming or accessing the name of a cursor</title>
+<prolog><metadata>
+<keywords><indexterm>Cursors<indexterm>naming</indexterm></indexterm><indexterm>Cursors<indexterm>accessing
+system-generated names</indexterm></indexterm></keywords>
+</metadata></prolog>
+<taskbody>
+<context> <p>There is no SQL language command to <i>assign</i> a name to a
+cursor. You can use the JDBC <codeph><i>setCursorName</i></codeph> method
+to assign a name to a <codeph><i>ResultSet</i></codeph> that allows positioned
+updates and deletes. You assign a name to a <codeph><i>ResultSet</i></codeph> with
+the <codeph><i>setCursorName</i></codeph> method of the <codeph><i>Statement</i></codeph> interface.
+You assign the name to a cursor before executing the <codeph><i>Statement</i></codeph> that
+will generate it.</p><codeblock>Statement s3 = conn.createStatement();
+<b>// name the statement so we can reference the result set
+// it generates</b>
+s3.setCursorName("UPDATABLESTATEMENT");
+<b>// we will be able to use the following statement later
+//to access the current row of the cursor</b>
+PreparedStatement ps2 = conn.prepareStatement(
+     "UPDATE FlightBookings SET number_seats = ? " +
+        "WHERE CURRENT OF UPDATABLESTATEMENT");</codeblock><p>Typically, you
+do not assign a name to the cursor, but let the system generate one for you
+automatically. You can determine the system-generated cursor name of a <i>ResultSet</i> generated
+by a SELECT statement using the <codeph><i>ResultSet</i></codeph> class's <codeph><i>getCursorName</i></codeph> method.</p><?Pub Caret?><codeblock
+>PreparedStatement ps2 = conn.prepareStatement(
+    "UPDATE employee SET bonus = ? WHERE CURRENT OF "+
+        Updatable.getCursorName());</codeblock></context>
+</taskbody>
+</task>
+<?Pub *0000001970?>

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

Modified: incubator/derby/docs/trunk/src/devguide/tdevconcepts839040.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevconcepts839040.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevconcepts839040.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevconcepts839040.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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
-<task xml:lang="en-us" id="tdevconcepts839040">
-<title>Turning Off Auto-Commit</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Auto-commit<indexterm>turning off</indexterm></indexterm>
-<indexterm>Auto-commit<indexterm>turning off with JDBC</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog><taskbody><context>
-<p>You can disable auto-commit with the <i>Connection</i> class's <i>setAutoCommit</i> method:</p>
-<codeblock>conn.setAutoCommit(false);</codeblock></context></taskbody></task>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
+<task xml:lang="en-us" id="tdevconcepts839040">
+<title>Turning Off Auto-Commit</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Auto-commit<indexterm>turning off</indexterm></indexterm>
+<indexterm>Auto-commit<indexterm>turning off with JDBC</indexterm></indexterm>
+</keywords>
+</metadata>
+</prolog><taskbody><context>
+<p>You can disable auto-commit with the <i>Connection</i> class's <i>setAutoCommit</i> method:</p>
+<codeblock>conn.setAutoCommit(false);</codeblock></context></taskbody></task>

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

Modified: incubator/derby/docs/trunk/src/devguide/tdevcsecure81850.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevcsecure81850.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevcsecure81850.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevcsecure81850.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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
-<task xml:lang="en-us" id="tdevcsecure81850">
-<title>Configuring security in an embedded environment</title>
-<prolog>
-</prolog><taskbody><context>
-<p>In an embedded environment, typically there is only one database per system
-and there are no administrative resources to protect databases.</p></context><steps>
-<step><cmd>Encrypt the database when you create it.</cmd></step>
-<step><cmd>Configure all security features as database-level properties.  These properties
-are stored in the database (which is encrypted). See <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</cmd></step>
-<step><cmd>Turn on protection for database-level properties so that they cannot be
-overridden by system properties by setting the <i>derby.database.propertiesOnly</i> property to TRUE.</cmd></step>
-<step><cmd>To prevent unauthorized users from accessing databases once they are booted,
-turn on user authentication for the database and configure user authorization
-for the database.  See <xref href="cdevcsecure42374.dita#cdevcsecure42374"/> and <xref href="cdevcsecure36595.dita#cdevcsecure36595"/> for more information.</cmd></step>
-<step><cmd>If you are using <ph conref="devconrefs.dita#prod/productshortname"></ph>'s built-in users, configure each user
-as a database-level property so that user names and passwords can be encrypted.</cmd></step></steps><result/></taskbody></task>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
+<task xml:lang="en-us" id="tdevcsecure81850">
+<title>Configuring security in an embedded environment</title>
+<prolog>
+</prolog><taskbody><context>
+<p>In an embedded environment, typically there is only one database per system
+and there are no administrative resources to protect databases.</p></context><steps>
+<step><cmd>Encrypt the database when you create it.</cmd></step>
+<step><cmd>Configure all security features as database-level properties.  These properties
+are stored in the database (which is encrypted). See <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</cmd></step>
+<step><cmd>Turn on protection for database-level properties so that they cannot be
+overridden by system properties by setting the <i>derby.database.propertiesOnly</i> property to TRUE.</cmd></step>
+<step><cmd>To prevent unauthorized users from accessing databases once they are booted,
+turn on user authentication for the database and configure user authorization
+for the database.  See <xref href="cdevcsecure42374.dita#cdevcsecure42374"/> and <xref href="cdevcsecure36595.dita#cdevcsecure36595"/> for more information.</cmd></step>
+<step><cmd>If you are using <ph conref="devconrefs.dita#prod/productshortname"></ph>'s built-in users, configure each user
+as a database-level property so that user names and passwords can be encrypted.</cmd></step></steps><result/></taskbody></task>

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

Modified: incubator/derby/docs/trunk/src/devguide/tdevcsecure82556.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevcsecure82556.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevcsecure82556.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevcsecure82556.dita Wed Mar 30 16:26:36 2005
@@ -1,35 +1,35 @@
-<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
-<task xml:lang="en-us" id="tdevcsecure82556">
-<title>Configuring security in a client/server environment</title>
-<prolog>
-</prolog><taskbody><context>
-<p>This procedure requires a system with multiple databases and some administrative
-resources. For systems that have a single database and for which there are
-no administrative resources, follow the instructions in <xref href="tdevcsecure81850.dita#tdevcsecure81850"/>.</p></context><steps>
-<step><cmd>Configure security features as system properties.  See <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</cmd></step>
-<step><cmd>Provide administrative-level protection for the <i>derby.properties</i> file and <ph conref="devconrefs.dita#prod/productshortname"></ph> databases. For example, you can protect these files
-and directories with operating system permissions and firewalls.</cmd></step>
-<step><cmd>Turn on user authentication for your system.  All users must provide valid
-user IDs and passwords to access the <ph conref="devconrefs.dita#prod/productshortname"></ph> system. See <xref href="cdevcsecure42374.dita#cdevcsecure42374"/> for information. If you are using <ph conref="devconrefs.dita#prod/productshortname"></ph>'s built-in
-users, configure users for the system in the <i>derby.properties</i> file. Provide the protection for this file.</cmd></step>
-<step><cmd>Configure user authorization for sensitive databases in your system. 
-Only designated users will be able to access sensitive databases. You typically
-configure user authorization with database-level properties. See <xref href="cdevcsecure36595.dita#cdevcsecure36595"/> for information. It is also possible to configure user authorization
-with system-level properties. This is useful when you are developing systems
-or when all databases have the same level of sensitivity.</cmd></step></steps><result/></taskbody></task>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
+<task xml:lang="en-us" id="tdevcsecure82556">
+<title>Configuring security in a client/server environment</title>
+<prolog>
+</prolog><taskbody><context>
+<p>This procedure requires a system with multiple databases and some administrative
+resources. For systems that have a single database and for which there are
+no administrative resources, follow the instructions in <xref href="tdevcsecure81850.dita#tdevcsecure81850"/>.</p></context><steps>
+<step><cmd>Configure security features as system properties.  See <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.</cmd></step>
+<step><cmd>Provide administrative-level protection for the <i>derby.properties</i> file and <ph conref="devconrefs.dita#prod/productshortname"></ph> databases. For example, you can protect these files
+and directories with operating system permissions and firewalls.</cmd></step>
+<step><cmd>Turn on user authentication for your system.  All users must provide valid
+user IDs and passwords to access the <ph conref="devconrefs.dita#prod/productshortname"></ph> system. See <xref href="cdevcsecure42374.dita#cdevcsecure42374"/> for information. If you are using <ph conref="devconrefs.dita#prod/productshortname"></ph>'s built-in
+users, configure users for the system in the <i>derby.properties</i> file. Provide the protection for this file.</cmd></step>
+<step><cmd>Configure user authorization for sensitive databases in your system. 
+Only designated users will be able to access sensitive databases. You typically
+configure user authorization with database-level properties. See <xref href="cdevcsecure36595.dita#cdevcsecure36595"/> for information. It is also possible to configure user authorization
+with system-level properties. This is useful when you are developing systems
+or when all databases have the same level of sensitivity.</cmd></step></steps><result/></taskbody></task>

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

Modified: incubator/derby/docs/trunk/src/devguide/tdevdeploy19136.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdeploy19136.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdeploy19136.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdeploy19136.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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
-<task xml:lang="en-us" id="tdevdeploy19136">
-<title>Deploying the database on the read-only media</title>
-<prolog><metadata>
-<keywords>
-<indexterm>Read-only databases<indexterm>deploying</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog><taskbody><context/><steps>
-<step><cmd>Move the database directory to the read-only media, including the necessary
-subdirectory directories (<i>log</i> and <i>seg0</i>) and the file <codeph><i>service.properties</i></codeph>.</cmd></step>
-<step><cmd>Use the database as usual, except that you will not be able to insert
-or update any data in the database or create or drop dictionary objects.</cmd></step></steps><result/></taskbody></task>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN" "../dtd/task.dtd">
+<task xml:lang="en-us" id="tdevdeploy19136">
+<title>Deploying the database on the read-only media</title>
+<prolog><metadata>
+<keywords>
+<indexterm>Read-only databases<indexterm>deploying</indexterm></indexterm>
+</keywords>
+</metadata>
+</prolog><taskbody><context/><steps>
+<step><cmd>Move the database directory to the read-only media, including the necessary
+subdirectory directories (<i>log</i> and <i>seg0</i>) and the file <codeph><i>service.properties</i></codeph>.</cmd></step>
+<step><cmd>Use the database as usual, except that you will not be able to insert
+or update any data in the database or create or drop dictionary objects.</cmd></step></steps><result/></taskbody></task>

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

Modified: incubator/derby/docs/trunk/src/devguide/tdevdeploy26887.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdeploy26887.dita?view=diff&r1=159547&r2=159548
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdeploy26887.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdeploy26887.dita Wed Mar 30 16:26:36 2005
@@ -1,54 +1,54 @@
-<?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 task PUBLIC "-//IBM//DTD DITA Task//EN"
- "../dtd/task.dtd">
-<task id="tdevdeploy26887" xml:lang="en-us">
-<title>Creating and preparing the database for read-only use</title>
-<prolog><metadata>
-<keywords><indexterm>Read-only databases<indexterm>creating</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<context> <p>To create databases for use on read-only media:</p></context>
-<steps>
-<step><cmd>Create and populate the database on read-write media.</cmd></step>
-<step><cmd>Commit all transactions and shut down <ph conref="devconrefs.dita#prod/productshortname"></ph> in
-the prescribed manner (see <xref href="tdevdvlp40464.dita#tdevdvlp40464"></xref>).
-If you do not shut down <ph conref="devconrefs.dita#prod/productshortname"></ph> in
-the prescribed manner, <ph conref="devconrefs.dita#prod/productshortname"></ph> will
-need to perform recovery the next time the system boots. <ph conref="devconrefs.dita#prod/productshortname"></ph> cannot
-perform recovery on read-only media.</cmd></step>
-<step><cmd>Delete the <i>tmp</i> directory if one was created within your
-database directory. If you include this directory, <ph conref="devconrefs.dita#prod/productshortname"></ph> will
-attempt to delete it and will return errors when attempting to boot a database
-on read-only media.</cmd></step>
-<step><cmd>For the read-only database, set the property <i>derby.storage.tempDirectory</i> to
-a writable location.</cmd><info><ph conref="devconrefs.dita#prod/productshortname"></ph> needs
-to write to temporary files for large sorts required by such SQL statements
-as ORDER BY, UNION, DISTINCT, and GROUP BY. For more information about this
-property, see <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.<codeblock>derby.storage.tempDirectory=c:/temp/mytemp</codeblock></info>
-</step>
-<step><cmd>Configure the database to send error messages to a writable file
-or to an output stream.</cmd><info>For information, see <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.<codeblock>derby.stream.error.file=c:/temp/mylog.LOG</codeblock
-></info></step>
-</steps>
-<result>Be sure to set these properties so<?Pub Caret?> that they are deployed
-with the database.  For more information, see <xref href="cdevdeploy18639.dita#cdevdeploy18639"></xref>.</result>
-</taskbody>
-</task>
-<?Pub *0000002418?>
+<?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 task PUBLIC "-//IBM//DTD DITA Task//EN"
+ "../dtd/task.dtd">
+<task id="tdevdeploy26887" xml:lang="en-us">
+<title>Creating and preparing the database for read-only use</title>
+<prolog><metadata>
+<keywords><indexterm>Read-only databases<indexterm>creating</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<taskbody>
+<context> <p>To create databases for use on read-only media:</p></context>
+<steps>
+<step><cmd>Create and populate the database on read-write media.</cmd></step>
+<step><cmd>Commit all transactions and shut down <ph conref="devconrefs.dita#prod/productshortname"></ph> in
+the prescribed manner (see <xref href="tdevdvlp40464.dita#tdevdvlp40464"></xref>).
+If you do not shut down <ph conref="devconrefs.dita#prod/productshortname"></ph> in
+the prescribed manner, <ph conref="devconrefs.dita#prod/productshortname"></ph> will
+need to perform recovery the next time the system boots. <ph conref="devconrefs.dita#prod/productshortname"></ph> cannot
+perform recovery on read-only media.</cmd></step>
+<step><cmd>Delete the <i>tmp</i> directory if one was created within your
+database directory. If you include this directory, <ph conref="devconrefs.dita#prod/productshortname"></ph> will
+attempt to delete it and will return errors when attempting to boot a database
+on read-only media.</cmd></step>
+<step><cmd>For the read-only database, set the property <i>derby.storage.tempDirectory</i> to
+a writable location.</cmd><info><ph conref="devconrefs.dita#prod/productshortname"></ph> needs
+to write to temporary files for large sorts required by such SQL statements
+as ORDER BY, UNION, DISTINCT, and GROUP BY. For more information about this
+property, see <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.<codeblock>derby.storage.tempDirectory=c:/temp/mytemp</codeblock></info>
+</step>
+<step><cmd>Configure the database to send error messages to a writable file
+or to an output stream.</cmd><info>For information, see <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite>.<codeblock>derby.stream.error.file=c:/temp/mylog.LOG</codeblock
+></info></step>
+</steps>
+<result>Be sure to set these properties so<?Pub Caret?> that they are deployed
+with the database.  For more information, see <xref href="cdevdeploy18639.dita#cdevdeploy18639"></xref>.</result>
+</taskbody>
+</task>
+<?Pub *0000002418?>

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



Mime
View raw message