db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r202296 [4/16] - in /incubator/derby/docs/trunk/src: adminguide/ devguide/ getstart/ ref/ tools/ tuning/
Date Tue, 28 Jun 2005 22:46:37 GMT
Modified: incubator/derby/docs/trunk/src/adminguide/tadminappsruntimeinfo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminappsruntimeinfo.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminappsruntimeinfo.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminappsruntimeinfo.dita Tue Jun 28 15:46:15 2005
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
-
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -19,23 +17,19 @@
 limitations under the License.
 -->
 <task id="tadminappsruntimeinfo" xml:lang="en-us">
-<title>Obtaining Network Server runtime information by using the runtimeinfo
-command</title>
+<title>Obtaining Network Server runtime information</title>
 <taskbody>
-<context> <p>Use the <b>runtimeinfo</b> command to get runtime information
-about the Network Server. This command will provide information about memory
-usage and current sessions, including the user, database, and prepared statement
-information.</p> </context>
+<context> <p>Use the <b>runtimeinfo</b> command or <b>getRuntimeInfo</b> method
+to get memory usage and current session information about the Network Server
+including user, database, and prepared statement information.</p> </context>
 <steps-unordered>
-<step><cmd>Using the command line:</cmd><info><p>To run <b>runtimeinfo</b> from
-the command line, enter: </p></info><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl runtimeinfo [-h &lt;<i>hostname</i>&gt;][&lt;-p <i
->portnumber</i>&gt;] </codeblock></stepxmp></step>
-<step><cmd>Using the API:</cmd><info><p>The getRuntimeInfo method returns
-the same information as the <b>runtimeinfo</b> command. The signature for
-the getRuntimeInfo method is String getRuntimeInfo(). For example:</p></info>
-<stepxmp><codeblock>NetworkServerControl serverControl = new NetworkServerControl();
-String myinfo = serverControl.getRuntimeInfo(); </codeblock></stepxmp></step>
+<step><cmd>To run <b>runtimeinfo</b> from the command line:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl runtimeinfo 
+   [-h &lt;<i>hostname</i>&gt;][&lt;-p <i>portnumber</i>&gt;] </codeblock></stepxmp></step>
+<step><cmd>The <b>getRuntimeInfo</b> method returns the same information as
+the <b>runtimeinfo</b> command. The signature for the getRuntimeInfo method
+is String getRuntimeInfo(). For example:</cmd><stepxmp><codeblock>NetworkServerControl serverControl = new NetworkServerControl();
+String <i>myinfo</i> = serverControl.getRuntimeInfo(); </codeblock></stepxmp>
+</step>
 </steps-unordered>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita Tue Jun 28 15:46:15 2005
@@ -19,29 +19,32 @@
 <task id="tadmincbdjhhfd" xml:lang="en-us">
 <title>Starting the Network Server</title>
 <prolog><metadata>
-<keywords><indexterm>Starting Network Server<indexterm>from scripts</indexterm></indexterm>
+<keywords><indexterm>Starting the Network Server<indexterm>from scripts</indexterm></indexterm>
 <indexterm>Network Server<indexterm>starting</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
 <context> <p>Note that you should always properly shut down the Network Server
-after use, because failure to do so might result in unpredictable side-effects, such as blocked ports on the server.</p><p>The
-startNetworkServer.bat (Windows) and startNetworkServer.ksh (UNIX) scripts
-start the server. These scripts are located in $<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>/frameworks/NetworkServer/bin,
+after use, because failure to do so might result in unpredictable side-effects,
+such as blocked ports on the server.</p><p>Use the startNetworkServer.bat
+script to start the Network Server on Windows machines and the startNetworkServer.ksh
+script to start the Network Server on UNIX systems. These scripts are located
+in $<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>/frameworks/NetworkServer/bin,
 where $<ph conref="adminconrefs.dita#prod/productinstallpath"></ph> is the
-directory where you installed <ph conref="adminconrefs.dita#prod/productshortname"></ph>.
-The Network Server itself resides in the $<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>/lib
-directory.</p><p>You can only run NetworkServerControl commands from the host
-that started the Network Server.</p> </context>
-<example><p>To start the Network Server, you run the appropriate script from
-the command line. For example, if you have installed <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
-the default directory on the C drive (in Windows) and you have set up your
-class path correctly, type the following command:</p><codeblock>$<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>\frameworks\NetworkServer\bin\startNetworkserver.bat</codeblock
->The default system directory is the directory in which <ph conref="adminconrefs.dita#prod/productshortname"></ph> was
+directory where you installed <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</p><p>You
+can run NetworkServerControl commands only from the host that started the
+Network Server.</p> </context>
+<example>To start the Network Server, you run the appropriate script from
+the command line. For example, on a Windows system, if you have installed <ph
+conref="adminconrefs.dita#prod/productshortname"></ph> in the default directory
+on the C drive and you have set up your classpath correctly, type the following
+command:<codeblock>$<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>\frameworks\NetworkServer\bin\startNetworkserver.bat</codeblock>The
+default system directory is the directory in which <ph conref="adminconrefs.dita#prod/productshortname"></ph> was
 started. (See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for
 more information about the default system directory.)<note type="tip">You
 can set $<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>\frameworks\NetworkServer\bin
 in your path to shorten the command.</note></example>
-<postreq><p>By default, the Network Server will only listen to requests on
-the loopback address, so it will only accept connections from the local host.</p></postreq>
+<postreq><p>By default, the Network Server will listen to requests only on
+the loopback address, which means that it will only accept connections from
+the local host.</p></postreq>
 </taskbody>
 </task>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfig813498.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfig813498.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfig813498.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfig813498.dita Tue Jun 28 15:46:15 2005
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
- "../dtd/task.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.
--->
-<task id="tadminconfig813498" xml:lang="en-us">
-<title>Setting the class path</title>
-<prolog><metadata>
-<keywords><indexterm>Class path<indexterm>for Network Server</indexterm></indexterm>
-<indexterm>Network Server<indexterm>class path and</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<prereq><p>Before starting the server, be sure the jar files for the Network
-Server and <ph conref="adminconrefs.dita#prod/productshortname"></ph> libraries
-are in your class path. For example, if you have installed <ph conref="adminconrefs.dita#prod/productshortname"></ph> under C:\<ph
-conref="adminconrefs.dita#prod/productlowercase"></ph>, do the following: </p><ol>
-<li>Add C:\<ph conref="adminconrefs.dita#prod/productlowercase"></ph>\lib\<ph
-conref="adminconrefs.dita#prod/productlowercase"></ph>.jar and C:\<ph conref="adminconrefs.dita#prod/productlowercase"></ph>\lib\<ph
-conref="adminconrefs.dita#prod/productlowercase"></ph>net.jar to the class
-path.</li>
-<li>Add the libraries for any Java classes that are used in your databases.</li>
-</ol></prereq>
-<context> <p><ph conref="adminconrefs.dita#prod/productshortname"></ph> provides
-the following script files for setting the class path. These are located in
-$<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>\frameworks\NetworkServer\bin.</p> <ul>
-<li>setNetworkClientCP.bat (Windows)</li>
-<li>setNetworkClientCP.ksh (UNIX)</li>
-<li>setNetworkServerCP.bat (Windows)</li>
-<li>setNetworkServerCP.ksh (UNIX)</li>
-</ul> </context>
-<postreq>See <cite><ph conref="adminconrefs.dita#pub/citgetstart"></ph></cite> for
-more information on setting class path.</postreq>
-</taskbody>
-</task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfig813694.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfig813694.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfig813694.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfig813694.dita Tue Jun 28 15:46:15 2005
@@ -23,25 +23,29 @@
 API<indexterm>NetworkServerControl class and</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>If you are using the API, you need to create an instance of the
-NetworkServerControl class first. There are two constructor methods for this
-class:</p></context>
-<steps>
-<step><cmd>NetworkServerControl()</cmd><stepresult><p>Creates an instance
-which listens either on the default port (1527) or the port set by the <codeph>derby.drda.portNumber</codeph> property.
-It will also listen on the host set by the <codeph>derby.drda.host</codeph> property
+<context> <p>You need to create an instance of the NetworkServerControl class
+if you are using the API. There are two constructor methods for this class:</p><note>Before
+enabling connections from other systems, ensure that you are running under
+security manager.</note></context>
+<steps-unordered>
+<step><cmd>NetworkServerControl()</cmd><stepresult><p>This constructor method
+creates an instance that listens either on the default port (1527) or the
+port that is set by the <codeph>derby.drda.portNumber</codeph> property. It
+will also listen on the host set by the <codeph>derby.drda.host</codeph> property
 or the loopback address if the property is not set. This is the default constructor;
 it does not allow remote connections. It is equivalent to calling NetworkServerControl(InetAddress.getByName("localhost"),1527)
 if no properties are set.</p></stepresult></step>
 <step><cmd>NetworkServerControl (InetAddress address, int portNumber)</cmd>
-<stepresult><p>Creates an instance that listens on the specified <codeph>portNumber</codeph> on
-the specified address. The <codeph>InetAddress</codeph> will be passed to <codeph>ServerSocket</codeph>.
-NULL is an invalid address value.  The following examples show how you might
-allow Network Server to accept connections from other hosts: <codeblock>//accepts connections from other hosts on an IPv4 system
-NetworkServerControl serverControl = new NetworkServerControl(InetAddress.getByName("0.0.0.0"),1527);</codeblock> <codeblock>//accepts connections from other hosts on an IPV6 system
-NetworkServerControl serverControl = new NetworkServerControl(InetAddress.getByName("::"),1527);</codeblock></p><note>Before
-enabling connections from other systems, ensure that you are running under
-security manager.</note></stepresult></step>
-</steps>
+<stepresult><p>This constructor method creates an instance that listens on
+the specified <codeph>portNumber</codeph> on the specified address. The <codeph>InetAddress</codeph> will
+be passed to <codeph>ServerSocket</codeph>. NULL is an invalid address value.
+ The following examples show how you might allow Network Server to accept
+connections from other hosts: <codeblock>//accepts connections from other hosts on an IPv4 system
+NetworkServerControl serverControl = 
+  new NetworkServerControl(InetAddress.getByName("0.0.0.0"),1527);</codeblock> <codeblock>//accepts connections from other hosts on an IPV6 system
+NetworkServerControl serverControl = 
+  new NetworkServerControl(InetAddress.getByName("::"),1527);</codeblock></p></stepresult>
+</step>
+</steps-unordered>
 </taskbody>
 </task>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfig814934.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfig814934.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfig814934.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfig814934.dita Tue Jun 28 15:46:15 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -18,16 +17,15 @@
 limitations under the License.
 -->
 <task id="tadminconfig814934" xml:lang="en-us">
-<title>Starting the Network Server without the script</title>
+<title>Starting the Network Server without using the script</title>
 <prolog><metadata>
 <keywords><indexterm>Network Server<indexterm>starting from a command line</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>If you don't want to use one of the scripts provided, you can
+<context> <p>If you don't want to use the StartNetworkServer script, you can
 start the Network Server by using the command line. The syntax for the command
-looks like this:</p> <codeblock>java org.apache.derby.drda.NetworkServerControl start [-h &lt;<i>hostname</i>&gt;] [-p &lt;<i>portNumber</i
->&gt;]</codeblock></context>
+looks like this:</p> <codeblock>java org.apache.derby.drda.NetworkServerControl start
+   [-h &lt;<i>hostname</i>&gt;] [-p &lt;<i>portNumber</i>&gt;]</codeblock></context>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfig814963.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfig814963.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfig814963.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfig814963.dita Tue Jun 28 15:46:15 2005
@@ -24,22 +24,24 @@
 </metadata></prolog>
 <taskbody>
 <context><p>Note that you should always properly shut down the Network Server
-after use, because failure to do so might result in unpredictable side-effects, such as blocked ports on the server.</p><p>There
-are two ways to start the Network Server from a Java application.</p> </context>
-<steps>
+after use, because failure to do so might result in unpredictable side-effects,
+such as blocked ports on the server.</p><p>There are two ways to start the
+Network Server from a Java application.</p> </context>
+<steps-unordered>
 <step><cmd>You can include the following line in the <codeph>derby.properties</codeph> file: </cmd>
 <stepxmp><codeblock>derby.drda.startNetworkServer=true</codeblock>This starts
 the server on the default port, 1527, listening on <codeph>localhost</codeph> (all
-interfaces). </stepxmp><stepxmp><p>You can specify a different port or a specific
-interface in the <codeph>derby.properties</codeph> file. For example:</p><codeblock>derby.drda.portNumber=1110
-derby.drda.host=myhost</codeblock></stepxmp><stepxmp>You can also specify
+interfaces).</stepxmp><stepxmp><p>To specify a different port or a specific
+interface in the <codeph>derby.properties</codeph> file, include the following
+lines, respectively:</p><codeblock>derby.drda.portNumber=1110
+derby.drda.host=<i>myhost</i></codeblock></stepxmp><stepxmp>You can also specify
 the <codeph>startNetworkServer</codeph> and <codeph>portNumber</codeph> properties
 by using a Java command: <codeblock>java -Dderby.drda.startNetworkServer=true
 -Dderby.drda.portNumber=1110
--Dderby.drda.host=myhost yourApp</codeblock></stepxmp></step>
+-Dderby.drda.host=<i>myhost yourApp</i></codeblock></stepxmp></step>
 <step><cmd>You can use the NetworkServerControl API to start the Network Server
 from a separate thread within a Java application:  </cmd><stepxmp><codeblock>NetworkServerControl server = new NetworkServerControl();
 server.start (null);</codeblock></stepxmp></step>
-</steps>
+</steps-unordered>
 </taskbody>
 </task>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfig815768.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfig815768.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfig815768.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfig815768.dita Tue Jun 28 15:46:15 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -18,11 +17,10 @@
 limitations under the License.
 -->
 <task id="tadminconfig815768" xml:lang="en-us">
-<title>Obtaining system information using the command line</title>
+<title>Obtaining system information by using the command line</title>
 <taskbody>
 <context> <p>To run <b>sysinfo</b> from the command line, use the following
-command while the Network Server is running:</p> <codeblock>java org.apache.derby.drda.NetworkServerControl
+command while the Network Server is running:</p><codeblock>java org.apache.derby.drda.NetworkServerControl
 sysinfo [-h &lt;<i>hostname</i>&gt;][-p &lt;<i>portnumber</i>&gt;] </codeblock></context>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfig815822.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfig815822.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfig815822.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfig815822.dita Tue Jun 28 15:46:15 2005
@@ -21,7 +21,7 @@
 <title>Obtaining Network Server properties by using the getCurrent Properties
 method</title>
 <taskbody>
-<context> <p>The getCurrentProperties method is an additional Java method
+<context> <p>The getCurrentProperties method is a Java method
 that you can use to obtain information about the Network Server. It returns
 a Properties object with the value of all the NetServer properties as they
 are currently set.</p><p>The signature of this method is:</p><codeblock>Properties getCurrentProperties();</codeblock></context>
@@ -30,7 +30,7 @@
 p.list(System.out);
 System.out.println(p.getProperty("derby.drda.host"));</codeblock><p>As shown
 in the previous example, you can look up the current properties and then work
-with individual properties if needed using various APIs on the Properties
+with individual properties if needed by using various APIs on the Properties
 class. You can also print out all the properties by using the Properties.list()
 method.</p></example>
 <postreq><p>See <xref href="cadminservlet98430.dita#cadminservlet98430"></xref> for

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfig815853.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfig815853.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfig815853.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfig815853.dita Tue Jun 28 15:46:15 2005
@@ -18,14 +18,14 @@
 limitations under the License.
 -->
 <task id="tadminconfig815853" xml:lang="en-us">
-<title>Obtaining system information using the API</title>
+<title>Obtaining system information by using the API</title>
 <taskbody>
-<context> <p>The <b>sysinfo</b> method produces the same information as the <codeph>sysinfo</codeph> command.
+<context> <p>The <b>sysinfo</b> method produces the same information as the <b>sysinfo</b> command.
 The signature for this method is</p> <codeblock>String getSysinfo();</codeblock> </context>
 <example><p>For example:</p><codeblock>NetworkServerControl serverControl = new NetworkServerControl();
 String myinfo = serverControl.getSysinfo();</codeblock><p>These methods return
-information about the Network Server running on the current machine on port
-1527.</p></example>
+information about the Network Server running on the current machine on the default port
+number (1527).</p></example>
 </taskbody>
 </task>
 

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfigalteringthestartnetworkserverscr.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfigalteringthestartnetworkserverscr.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfigalteringthestartnetworkserverscr.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfigalteringthestartnetworkserverscr.dita Tue Jun 28 15:46:15 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -23,19 +22,17 @@
 <context> <p>You can modify the startNetworkServer script in any of the following
 ways:</p> </context>
 <steps-unordered>
-<step><cmd>Specify a port number other than the default(1527). You can do
-this by adding <codeph>-p &lt;<i>portnumber</i>&gt;</codeph> after the <b>start</b> command,
-like in the following example:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl start -p <i>1368</i></codeblock>where <i>1368</i
-> is the new port number.</stepxmp></step>
+<step><cmd>Specify a port number other than the default (1527) by using the <codeph>-p &lt;<i>portnumber</i>&gt;</codeph> option
+as shown in the following example:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl start -p 1368</codeblock>where
+1368 is the new port number.</stepxmp></step>
 <step><cmd>Specify a specific interface (host name or IP address) to listen
-on other than the default (<codeph>localhost</codeph>). You
-can do this by adding <codeph>-h</codeph> to the following command: </cmd>
-<stepxmp><note type="remember">Before using this option, you should run under
-the Java security manager and enable user authentication.</note><codeblock>java org.apache.derby.drda.NetworkServerControl start -h myhost -p <i>1368</i
-></codeblock>where <i>1368</i> is the new port number.</stepxmp><stepresult><p>This
-will enable connections from other hosts. On all interfaces, you can specify
-a host name, IP address or 0.0.0.0 to listen. </p></stepresult></step>
+on other than the default (<codeph>localhost</codeph> by using the <codeph>-h</codeph> option
+as shown in the following example: </cmd><stepxmp><note type="remember">Before
+using this option, you should run under the Java security manager and enable
+user authentication.</note><codeblock>java org.apache.derby.drda.NetworkServerControl start -h <i>myhost</i> -p 1368</codeblock>where <i>myhost</i
+> is the host name or IP address.</stepxmp><stepresult><p>On all interfaces,
+you can specify a host name, IP address or 0.0.0.0 to listen.</p></stepresult>
+</step>
 </steps-unordered>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita Tue Jun 28 15:46:15 2005
@@ -23,31 +23,14 @@
 <indexterm>Properties<indexterm>Network Server</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>You can specify Network Server properties in three ways: on the
-command line, in the <codeph>.bat</codeph> or <codeph>.ksh</codeph> files
-(loading the properties by executing <codeph>java -D</codeph>), or in the <codeph>derby.properties </codeph>file. </p><p>Properties
-in the command line or in the <codeph>.bat </codeph>or <codeph>.ksh</codeph> files
+<context> <p>You can specify Network Server properties in three ways: <ul>
+<li>On the command line</li>
+<li>In the <codeph>.bat</codeph> or <codeph>.ksh</codeph> files (loading the
+properties by executing <codeph>java -D</codeph>)</li>
+<li>In the <codeph>derby.properties</codeph> file. </li>
+</ul></p><p>Properties in the command line or in the <codeph>.bat </codeph>or <codeph>.ksh</codeph> files
 take precedence over the properties in the <codeph>derby.properties</codeph> file.
-Arguments given to commands on the command line take precedence over property
-values. </p><p>You can specify the following properties:</p> </context>
-<steps-unordered>
-<step><cmd><xref href="radminconfigstartnetworkserver.dita#radminconfigstartnetworkserver">derby.drda.startNetworkServer</xref></cmd>
-</step>
-<step><cmd><xref href="radminconfigportnumber.dita#radminconfigportnumber">derby.drda.portNumber</xref></cmd>
-</step>
-<step><cmd><xref href="radminconfigdb2jdrdatracedirectory.dita#radminconfigdb2jdrdatracedirectory"></xref></cmd>
-</step>
-<step><cmd><xref href="radminconfig.dita#radminconfig"></xref></cmd></step>
-<step><cmd><xref href="radminconfigdb2jdrdalogconnections.dita#radminconfigdb2jdrdalogconnections"></xref></cmd>
-</step>
-<step><cmd><xref href="radmindrdahost.dita#radmindrdahost">derby.drda.host</xref></cmd>
-</step>
-<step><cmd><xref href="radmindrdaminthreads.dita#radmindrdaminthreads">derby.drda.minThreads </xref></cmd>
-</step>
-<step><cmd><xref href="radmindrdamaxthreads.dita#radmindrdamaxthreads">derby.drda.maxThreads </xref></cmd>
-</step>
-<step><cmd><xref href="radmindrdatimeslice.dita#radmindrdatimeslice">derby.drda.timeslice</xref></cmd>
-</step>
-</steps-unordered>
+Arguments included on commands that are issued on the command line take precedence
+over property values.</p> </context>
 </taskbody>
 </task>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfigshuttingdownthenetworkserver.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfigshuttingdownthenetworkserver.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfigshuttingdownthenetworkserver.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfigshuttingdownthenetworkserver.dita Tue Jun 28 15:46:15 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -19,27 +18,27 @@
 -->
 <task id="tadminconfigshuttingdownthenetworkserver" xml:lang="en-us">
 <title>Shutting down the Network Server</title>
+<shortdesc>If user authentication is disabled, a <ph conref="adminconrefs.dita#prod/productshortname"></ph> database
+will shut down normally when the Network Server is shut down. If user authentication
+is enabled, you must explicitly shut down the database <i>before</i> shutting
+down the Network Server by specifying a valid <ph conref="adminconrefs.dita#prod/productshortname"></ph> user
+name and password.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Shutting down Network Server<indexterm>from scripts</indexterm></indexterm>
 <indexterm>Network Server<indexterm>shutting down</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>As long as user authentication is disabled, a <ph conref="adminconrefs.dita#prod/productshortname"></ph> database
-will shut down normally when the Network Server is shut down. If user authentication
-is enabled, you must explicitly shut down the database <i>before</i> shutting
-down the Network Server by specifying a valid <ph conref="adminconrefs.dita#prod/productshortname"></ph> user
-name and password. </p><p>The database can be shut down either directly, or
-by the <ph conref="adminconrefs.dita#prod/productshortname"></ph> server.</p></context>
+<context> <p>The database can be shut down either directly, or by the <ph
+conref="adminconrefs.dita#prod/productshortname"></ph> server.</p></context>
 <steps-unordered>
-<step><cmd>To shut down the Network Server from the scripts provided for Windows,
-use:</cmd><stepxmp><codeblock>stopNetworkServer.bat [-h <i>&lt;hostname&gt;</i>] [-p <i>&lt;portnumber&gt;</i>] </codeblock></stepxmp>
+<step><cmd>To shut down the Network Server by using the scripts that are provided
+for Windows systems, use:</cmd><stepxmp><codeblock>stopNetworkServer.bat [-h <i>&lt;hostname&gt;</i>] [-p <i>&lt;portnumber&gt;</i>] </codeblock></stepxmp>
 </step>
-<step><cmd>To shut down the Network Server from the scripts provided for Unix,
-use:</cmd><stepxmp><codeblock>stopNetworkServer.ksh [-h <i>&lt;hostname&gt;</i>] [-p <i>&lt;portnumber&gt;</i>] </codeblock></stepxmp>
-<info><note>These scripts are located in the $<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>/frameworks/NetworkServer/bin
-directory.</note></info></step>
+<step><cmd>To shut down the Network Server by using the scripts that are provided
+for UNIX systems, use:</cmd><stepxmp><codeblock>stopNetworkServer.ksh [-h <i>&lt;hostname&gt;</i>] [-p <i>&lt;portnumber&gt;</i>] </codeblock></stepxmp>
+<info>These scripts are located in the $<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>/frameworks/NetworkServer/bin
+directory.</info></step>
 </steps-unordered>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfigsysteminformation.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfigsysteminformation.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfigsysteminformation.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfigsysteminformation.dita Tue Jun 28 15:46:15 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -20,22 +19,21 @@
 <task id="tadminconfigsysteminformation" xml:lang="en-us">
 <title>Obtaining system information</title>
 <taskbody>
-<context> <p>You can get information about the Network Server such as version
-and current property values, Java information, and <ph conref="adminconrefs.dita#prod/productshortname"></ph> database
-server information, by using the <b>sysinfo</b> tool. The <b>sysinfo</b> utility
+<context> <p>You can obtain information about the Network Server, such as
+version and current property values, Java information, and <ph conref="adminconrefs.dita#prod/productshortname"></ph> database
+server information, by using the <b>sysinfo</b> utility. The <b>sysinfo</b> utility
 is available from scripts, the command line, the NetworkServerControl API,
-and through the servlet interface.</p> <p>The following scripts are located
+and through the servlet interface.</p><p>The following scripts are located
 in the $<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>/frameworks/NetworkServer/bin
-directory, and will return an error if the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Server is not started.</p> </context>
+directory. Before running these scripts, make sure that the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server is started.</p> </context>
 <steps-unordered>
-<step><cmd>To run <b>sysinfo</b> from the scripts provided in Windows, use:</cmd>
-<stepxmp><codeblock>sysinfo.bat [-h &lt;<i>hostname</i>&gt;][-p &lt;<i>portnumber</i>&gt;] </codeblock></stepxmp>
-</step>
-<step><cmd>To run <b>sysinfo</b> from the scripts provided in Unix, use:</cmd>
-<stepxmp><codeblock>sysinfo.ksh [-h &lt;<i>hostname</i>&gt;] [&lt;-p <i>portnumber</i>&gt;] </codeblock></stepxmp>
-</step>
+<step><cmd>Run the following <b>sysinfo</b> script to obtain information about
+the Network Server on a Windows system:</cmd><stepxmp><codeblock>sysinfo.bat [-h &lt;<i>hostname</i>&gt;][-p &lt;<i>portnumber</i>&gt;] </codeblock
+></stepxmp></step>
+<step><cmd>Run the following <b>sysinfo</b> script to obtain information about
+the Network Server on a UNIX system:</cmd><stepxmp><codeblock>sysinfo.ksh [-h &lt;<i>hostname</i>&gt;] [&lt;-p <i>portnumber</i>&gt;] </codeblock
+></stepxmp></step>
 </steps-unordered>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfiguringthenetworkserver.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfiguringthenetworkserver.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfiguringthenetworkserver.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfiguringthenetworkserver.dita Tue Jun 28 15:46:15 2005
@@ -27,10 +27,10 @@
 of threads to handle connections. You can change the configuration on the
 command line or by using the servlet interface.</p> <p>The minimum number
 of threads is the number of threads that are started when the Network Server
-is booted. This is specified as a property, <codeph>derby.drda.minThreads
+is booted. This value is specified as a property, <codeph>derby.drda.minThreads
 = &lt;<i>min</i>&gt;</codeph>. The maximum number of threads is the maximum
 number of threads that will be used for connections. If more connections are
-active than threads available, the extra connections must wait until the next
+active than there are threads available, the extra connections must wait until the next
 thread becomes available. Threads can become available after a specified time,
 which is checked only when a thread has finished processing a communication.</p> </context>
 <steps-unordered>
@@ -48,7 +48,7 @@
 and check if there are waiting sessions, use the following command: </cmd>
 <stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl 
 timeslice &lt;<i>milliseconds</i>&gt; [-h &lt;<i>hostname</i>&gt;] [-p &lt;<i>portnumber</i>&gt;] </codeblock></stepxmp>
-<info><p>You can also set the <codeph>derby.drda.timeSlice</codeph> property
+<info><p>You can also use the derby.drda.timeSlice property
 to set this value. A value of 0 milliseconds indicates that the thread will
 not give up working on the session until the session ends. A value of -1 milliseconds
 indicates to use the default. The default value is 0. The maximum number of

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita Tue Jun 28 15:46:15 2005
@@ -18,20 +18,21 @@
 -->
 <task id="tadminconfigverifyingstartup" xml:lang="en-us">
 <title>Verifying Startup</title>
+<shortdesc>To verify that the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server is currently running, use the ping command.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Network Server<indexterm>verifying startup</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p><ph conref="adminconrefs.dita#prod/productshortname"></ph> has
-the ability to ping the server. </p> </context>
+<context> <p>You can use the ping command in the following ways:</p> </context>
 <steps-unordered>
-<step><cmd>You can use the scripts NetworkServerControl.bat (Windows) or NetworkServerControl.ksh
-(Unix) with the <b>ping</b> command. For example:  </cmd><stepxmp><codeblock>NetworkServerControl ping [-h &lt;<i>hostname</i>&gt;;] [-p &lt;<i>portnumber</i
->&gt;]</codeblock></stepxmp></step>
-<step><cmd>You can also use the <b>NetworkServerControl</b> command:</cmd>
-<stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl ping [-h &lt;<i>hostname</i>&gt;] [-p &lt;<i>portnumber</i>&gt;] </codeblock></stepxmp>
+<step><cmd>You can use the scripts NetworkServerControl.bat for Windows systems
+or NetworkServerControl.ksh for UNIX systems with the <b>ping</b> command.
+For example:  </cmd><stepxmp><codeblock>NetworkServerControl ping [-h &lt;<i>hostname</i>&gt;;] [-p &lt;<i>portnumber</i>&gt;]</codeblock></stepxmp>
 </step>
+<step><cmd>You can use the NetworkServerControl command:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl
+   ping [-h &lt;<i>hostname</i>&gt;] [-p &lt;<i>portnumber</i>&gt;] </codeblock></stepxmp></step>
 <step><cmd>You can use the NetworkServerControl API to verify startup from
 within a Java application: </cmd><stepxmp><codeblock>ping(); </codeblock></stepxmp>
 </step>

Modified: incubator/derby/docs/trunk/src/adminguide/tadmincrtdbbkup.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadmincrtdbbkup.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadmincrtdbbkup.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadmincrtdbbkup.dita Tue Jun 28 15:46:15 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -19,24 +18,23 @@
 -->
 <task id="tadmincrtdbbkup" xml:lang="en-us">
 <title>Creating a database from a backup copy</title>
+<shortdesc>To create a database from a full backup copy at a specified location,
+specify the <codeph>createFrom=<i>Path</i></codeph> attribute in the boot
+time connection URL.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Creating a database from a backup copy</indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>To create a database using a full backup at a specified location,
-you can specify the <codeph>createFrom=Path</codeph> attribute in the boot
-time connection URL . If there is already a database with the same name in
-derby.system.home, an error will occur and the existing database will be left
-intact. If there is not an existing database with the same name in the current
-derby.system.home location, the system will copy the whole database from the
-backup location to derby.system.home and start it.</p> <p>The Log files are
-also copied to the default location. You can use the <codeph>logDevice</codeph> attribute
-in conjunction with <codeph>createFrom=Path</codeph> to store logs in a different
-location. With <codeph>createFrom=Path</codeph> you do not need to copy the
-individual log files to the log directory.</p> </context>
-<example>For example, to create the toursDB database using a
-backup copy in <filepath>c:\mybackups\sample</filepath>, the connection URL
-should be:  <codeblock>jdbc:derby:sample;createFrom=c:\mybackups\sample</codeblock></example>
+<context> <p>If there is already a database with the same name in derby.system.home,
+an error will occur and the existing database will be left intact. If there
+is not an existing database with the same name in the current derby.system.home
+location, the system will copy the whole database from the backup location
+to derby.system.home and start it.</p><p>The log files are also copied to
+the default location. You can use the <codeph>logDevice</codeph> attribute
+in conjunction with the <codeph>createFrom=Path</codeph> attribute to store
+logs in a different location. With the <codeph>createFrom=Path</codeph> attribute,
+you do not need to copy the individual log files to the log directory.</p> </context>
+<example>For example, to create the sample database from a backup copy in <filepath>c:\mybackups\sample</filepath>,
+the connection URL should be:  <codeblock>jdbc:derby:sample;createFrom=c:\mybackups\sample</codeblock></example>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminhubbkup44.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminhubbkup44.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminhubbkup44.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminhubbkup44.dita Tue Jun 28 15:46:15 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -19,18 +18,18 @@
 -->
 <task id="tadminhubbkup44" xml:lang="en-us">
 <title>Restoring a database from a backup copy</title>
+<shortdesc>To restore a database by using a full backup from a specified location,
+specify the <codeph>restoreFrom=<i>Path</i></codeph> attribute in the boot
+time connection URL.</shortdesc>
 <taskbody>
-<context> <p>To restore a database using a full backup from a specified location,
-you can specify the <codeph>restoreFrom=Path</codeph> attribute in the boot
-time connection URL. If a database with the same name exists in the derby.system.home
-location, the system will delete the whole database, copy it from the backup
-location, and then restart it.</p><p>The log files are copied to the same
-location they were in when the backup was taken. You can use the <codeph>logDevice</codeph> attribute
-in conjunction with <codeph>restoreFrom=Path</codeph> to store logs in a different
-location.</p></context>
-<example> For example, to restore the toursDB database using a backup copy
-in <filepath>c:\mybackups\sample</filepath>, the connection URL
-should be: <codeblock>jdbc:derby:toursDB;restoreFrom=c:\mybackups\sample</codeblock></example>
+<context><p>If a database with the same name exists in the derby.system.home
+location, the system will delete the database, copy it from the backup location,
+and then restart it.</p><p>The log files are copied to the same location they
+were in when the backup was taken. You can use the <codeph>logDevice</codeph> attribute
+in conjunction with the <codeph>restoreFrom=<i>Path</i></codeph> attribute
+to store logs in a different location.</p></context>
+<example> For example, to restore the sample database by using a backup copy
+in <filepath>c:\mybackups\sample</filepath>, the connection URL should be: <codeblock>jdbc:derby:sample;restoreFrom=c:\mybackups\sample</codeblock
+></example>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminlog800206.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminlog800206.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminlog800206.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminlog800206.dita Tue Jun 28 15:46:15 2005
@@ -18,21 +18,22 @@
 limitations under the License.
 -->
 <task id="tadminlog800206" xml:lang="en-us">
-<title>Using the logDevice property</title>
+<title>Using the logDevice attribute</title>
+<shortdesc>To specify a non-default location for the log directory, set
+the logDevice attribute on the database connection URL when
+you create the database.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>logDevice</indexterm><indexterm>service.properties file<indexterm>setting
 logDevice in</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>To specify a non-default location for the log directory, set
-the <codeph>logDevice</codeph> attribute on the database connection URL when
-you create the database. (This attribute is meaningful only when you are creating
-a database.) You can specify <codeph>logDevice</codeph> as either an absolute
-path or a path relative to the directory where the JVM is executed.</p> <p>Setting <codeph>logDevice</codeph> on
-the database connection URL adds an entry to the <codeph>service.properties</codeph> file.
-If you ever move the log manually, you will need to alter the entry in <codeph>service.properties</codeph>.
-If you move the log back to the default location, remove the <codeph>logDevice</codeph>entry
-from the <codeph>service.properties</codeph> file.</p> </context>
+<context> <p>This attribute is meaningful only when you are creating
+a database. You can specify <codeph>logDevice</codeph> as either an absolute
+path or as a path that is relative to the directory where the JVM is executed.</p> <p>Setting logDevice on
+the database connection URL adds an entry to the service.properties file.
+If you ever move the log manually, you will need to alter the entry in service.properties.
+If you move the log back to the default location, remove the logDevice entry
+from the service.properties file.</p> </context>
 <example><p>To check the log location for an existing database, you can retrieve
 the <codeph>logDevice</codeph> attribute as a database property by using the
 following statement:</p><codeblock>VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice')</codeblock></example>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminlogfile.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminlogfile.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminlogfile.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminlogfile.dita Tue Jun 28 15:46:15 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
-
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -25,23 +24,22 @@
 </keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>The Network Server uses the <ph conref="adminconrefs.dita#prod/productshortname"></ph> <codeph>derby.log</codeph> file
-for logging problems it encounters. It also logs connections and disconnections
+<context> <p>The Network Server uses the <codeph>derby.log</codeph> file to
+log problems that it encounters. It also logs connections and disconnections
 when the property <codeph>derby.drda.logConnections</codeph> is set to <codeph>true</codeph>.
 The <codeph>derby.log </codeph>file is created when the <ph conref="adminconrefs.dita#prod/productshortname"></ph> server
 is started. The Network Server then records the time and version. If a log
 file exists, it is overwritten, unless the property <codeph>derby.infolog.append</codeph> is
 set to <codeph>true</codeph>. </p> </context>
 <steps-unordered>
-<step><cmd>Turn on connection and disconnection logging through the servlet
-interface or by using the following command:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl logconnections on [-h &lt;<i
->hostname</i>&gt;] [-p &lt;<i>portnumber</i>&gt;] </codeblock></stepxmp></step>
-<step><cmd>Turn connection logging off through the servlet interface or by
-using the following command:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl logconnections off [-h &lt;<i>hostname</i>&gt;][-p &lt;<i
->portnumber</i>&gt;] </codeblock></stepxmp></step>
+<step><cmd>To turn on connection and disconnection logging, you can use the
+servlet interface or you can issue the following command:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl 
+   logconnections on [-h &lt;<i>hostname</i>&gt;] [-p &lt;<i>portnumber</i>&gt;] </codeblock></stepxmp></step>
+<step><cmd>To turn connection logging off you can use the servlet interface
+or you can issue the following command:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl 
+   logconnections off [-h &lt;<i>hostname</i>&gt;][-p &lt;<i>portnumber</i>&gt;] </codeblock></stepxmp></step>
 </steps-unordered>
 <postreq>See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for
-more information about <codeph>derby.log</codeph>.</postreq>
+more information about the <codeph>derby.log</codeph> file.</postreq>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminnetservrun.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminnetservrun.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminnetservrun.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminnetservrun.dita Tue Jun 28 15:46:15 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -25,10 +24,10 @@
 </metadata></prolog>
 <taskbody>
 <context> <p>You should run the Network Server under the Java security manager.
-An example security policy file appears below. Fine tune this policy to suit
-your needs.</p> <note othertype="" type="caution">Opening up the server to
-all clients without limiting access by using the policy listed below is a
-severe security risk.</note> <codeblock>//Recommended set of permissions to start and use the Network Server,
+An sample security policy file is shown in the following examples. Fine tune
+this policy to suit your needs.</p><note othertype="" type="caution">Opening
+up the server to all clients without limiting access by using a policy similar
+to the one in the following example is a severe security risk.</note><codeblock>//Recommended set of permissions to start and use the Network Server,
 //assuming the 'd:/<ph conref="adminconrefs.dita#prod/productlowercase"></ph>/lib' directory has been secured. 
 //Fine tune based on your environment settings
 grant codeBase "file:d:/<ph conref="adminconrefs.dita#prod/productlowercase"></ph>/lib/-" {
@@ -54,22 +53,20 @@
 permission java.net.SocketPermission "&lt;host&gt;:*", "accept, connect, resolve";
 };</codeblock> </context>
 <example><ul>
-<li><p>The following example shows how to start the Network Server in the
-default security manager (listening to clients from <codeph>localhost</codeph> only,
+<li>The following example shows how to start the Network Server in the default
+security manager (listening to clients from <codeph>localhost</codeph> only,
 which is the default behavior if the <codeph>-h</codeph> option is not used
-to start the server). This example assumes that the policy file exists in <filepath>d:/nwsvr.policy</filepath>.</p><codeblock>java -Djava.security.manager -Djava.security.policy=d:/nwsvr.policy
+to start the server). This example assumes that the policy file exists in <filepath>d:/nwsvr.policy</filepath>.<codeblock>java -Djava.security.manager -Djava.security.policy=d:/nwsvr.policy
 org.apache.derby.drda.NetworkServerControl start </codeblock></li>
-<li><p>You can also achieve the same behavior with the following example,
-which makes explicit use of the <codeph>-h</codeph> option when starting the
-server:</p><codeblock>java -Djava.security.manager -Djava.security.policy=d:/nwsvr.policy
+<li>You can also achieve the same behavior by using the <codeph>-h</codeph> option
+when starting the server as shown in the following example:<codeblock>java -Djava.security.manager -Djava.security.policy=d:/nwsvr.policy
 org.apache.derby.drda.NetworkServerControl start -h localhost</codeblock></li>
-<li><p>The following example shows how to start the Network Server (assuming
-you start the server on the host machine <i>myserver.mydomain.com</i>) in
-the default security manager  (listening to client requests originating from
-other machines only). This example also assumes that the policy file exists
-in <filepath>d:/nwsvr.policy</filepath>.</p><codeblock>java -Djava.security.manager -Djava.security.policy=d:/nwsvr.policy
+<li>The following example shows how to start the Network Server (assuming
+that you start the server on the host machine <i>myserver.mydomain.com</i>)
+in the default security manager  (listening to client requests originating
+from other machines only). This example assumes that the policy file exists
+in <filepath>d:/nwsvr.policy</filepath>.<codeblock>java -Djava.security.manager -Djava.security.policy=d:/nwsvr.policy
 org.apache.derby.drda.NetworkServerControl start -h <i>myserver.mydomain.com</i></codeblock></li>
 </ul></example>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminovclirun.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminovclirun.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminovclirun.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminovclirun.dita Tue Jun 28 15:46:15 2005
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
-
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -21,27 +19,21 @@
 <task id="tadminovclirun" xml:lang="en-us">
 <title>Running the SimpleNetworkClientSample program</title>
 <taskbody>
-<context> <p>To connect to the Network Server that has been started as part
-of the SimpleNetworkServerSample program: </p></context>
+<context> <p>To connect to the Network Server that has been started with the
+SimpleNetworkServerSample program: </p></context>
 <steps>
-<step><cmd>Open a command prompt and change directories to the <codeph>%<ph
-conref="adminconrefs.dita#prod/productinstallpath"></ph>%\demo\programs\nserverdemo</codeph> directory,
-where <codeph>%<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%</codeph> is
-the directory where you installed <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</cmd>
+<step><cmd>Open a command prompt and change directories to the%<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%\demo\programs\nserverdemo
+directory, where %<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%
+is the directory where you installed <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</cmd>
 </step>
-<step><cmd>Network Server clients need only the following jar files in the
-CLASSPATH to connect to the Network Server. Set the CLASSPATH to include the
-following jar files: </cmd>
-<substeps>
-<substep><cmd>The current directory (".")</cmd></substep>
-<substep><cmd>derbyclient.jar</cmd><info>This jar file must be in your CLASSPATH
-to use the Network Client driver.</info></substep>
-</substeps>
-</step>
-<step><cmd>After you have set up your environment correctly, execute the application
-from the same directory: </cmd><stepxmp><codeblock>java SimpleNetworkClientSample</codeblock></stepxmp>
-<stepresult>You should receive output similar to the following if the program
-runs successfully: <codeblock>Starting Sample client program
+<step><cmd>Set the classpath to include the following jar files: </cmd><info><ul>
+<li>The current directory (".")</li>
+<li>derbyclient.jar</li>
+</ul></info></step>
+<step><cmd>After you set up your environment correctly, run the SimpleNetworkClientSample
+program from the same directory: </cmd><stepxmp><codeblock>java SimpleNetworkClientSample</codeblock></stepxmp>
+<stepresult>If the program runs successfully, you will receive output similar
+to that shown in the following example: <codeblock>Starting Sample client program
 Got a client connection via the DriverManager.
 connection from datasource; 
 Got a client connection via a DataSource.
@@ -53,4 +45,3 @@
 </steps>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita Tue Jun 28 15:46:15 2005
@@ -26,27 +26,28 @@
 is the directory where you installed <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</cmd>
 </step>
 <step><cmd>Set the CLASSPATH to the current directory (".") and also include
-the following jar files in order to use the Network Server and the Network
-Client driver:</cmd>
-<substeps>
-<substep><cmd>derbynet.jar</cmd><info><p>The Network Server jar file. It must
-be in your CLASSPATH to use any of the Network Server functions.</p></info>
-</substep>
-<substep><cmd>derbyclient.jar</cmd><info><p>This jar file must be in your
-CLASSPATH to use the Network Client driver.</p></info></substep>
-<substep><cmd>derby.jar</cmd><info><p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> database
-engine jar file.</p></info></substep>
-</substeps>
-</step>
+the following jar files in order to use the Network Server and the network
+client driver:</cmd><info><dl><dlentry>
+<dt>derbynet.jar</dt>
+<dd>The Network Server jar file. It must be in your CLASSPATH to use any of
+the Network Server functions.</dd>
+</dlentry><dlentry>
+<dt>derbyclient.jar</dt>
+<dd>This jar file must be in your CLASSPATH to use the Network Client driver.</dd>
+</dlentry><dlentry>
+<dt>derby.jar</dt>
+<dd>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> database
+engine jar file.</dd>
+</dlentry></dl></info></step>
 <step><cmd>Test the CLASSPATH settings by running the following Java command:</cmd>
 <stepxmp><codeblock> java org.apache.derby.tools.sysinfo</codeblock></stepxmp>
-<stepresult>This command will show the <ph conref="adminconrefs.dita#prod/productshortname"></ph> jar
-files that are in the CLASSPATH along with their respective versions.</stepresult>
+<stepresult>This command shows the <ph conref="adminconrefs.dita#prod/productshortname"></ph> jar
+files that are in the classpath as well as their respective versions.</stepresult>
 </step>
-<step><cmd>After you have set up your environment correctly, execute the application
+<step><cmd>After you set up your environment correctly, run the NsSample program
 from the same directory: </cmd><stepxmp><codeblock>java nserverdemo.NsSample</codeblock></stepxmp>
-<stepresult>You should receive output similar to the following if the program
-runs successfully:<codeblock><ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server created
+<stepresult>If the program runs successfully, you will receive output similar
+to that shown in the following table:<codeblock><ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server created
 Server is ready to accept connections on port 1621.
 Connection number: 1.
 [NsSample] <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server started.
@@ -90,12 +91,14 @@
 Shutdown successful.
 </codeblock></stepresult></step>
 </steps>
-<result>Running the <i>NsSample</i> program will also create the following
-new directories and files:<ul>
-<li>NSSampledb <p>This directory makes up the <i>NSSampledb</i> database.</p></li>
-<li>derby.log <p>This log file contains <ph conref="adminconrefs.dita#prod/productshortname"></ph> progress
-and error messages.</p></li>
-</ul></result>
+<result>Running the <i>NsSample</i> program also creates the following new
+directories and files:<dl><dlentry>
+<dt>NSSampledb</dt>
+<dd>This directory makes up the <i>NSSampledb</i> database.</dd>
+</dlentry><dlentry>
+<dt>derby.log </dt>
+<dd>This log file contains <ph conref="adminconrefs.dita#prod/productshortname"></ph> progress
+and error messages.</dd>
+</dlentry></dl></result>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita Tue Jun 28 15:46:15 2005
@@ -22,29 +22,27 @@
 <context> <p>To run the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
 Server sample program: </p> </context>
 <steps>
-<step><cmd>Open a command prompt and change directories to the <codeph>%<ph
-conref="adminconrefs.dita#prod/productinstallpath"></ph>%\demo\programs\nserverdemo</codeph> directory,
-where <codeph>%<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%</codeph> is
-the directory where you installed <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</cmd>
-</step>
-<step><cmd>Set the CLASSPATH to include the current directory (".") and the
-following jar files: </cmd>
-<substeps>
-<substep><cmd>derbynet.jar</cmd><info><p>The Network Server jar file. It must
-be in your CLASSPATH because you start the Network Server in this program. </p></info>
-</substep>
-<substep><cmd>derby.jar</cmd><info><p>The database engine jar file. </p></info>
-</substep>
-</substeps>
+<step><cmd>Open a command prompt and change directories to the %<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%\demo\programs\nserverdemo
+directory, where %<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%
+is the directory where you installed <ph conref="adminconrefs.dita#prod/productshortname"></ph>.</cmd>
 </step>
+<step><cmd>Set the classpath to include the current directory ("."), and the
+following jar files: </cmd><info><dl><dlentry>
+<dt>derbynet.jar</dt>
+<dd>The Network Server jar file. It must be in your CLASSPATH because you
+start the Network Server in this program.</dd>
+</dlentry><dlentry>
+<dt>derby.jar</dt>
+<dd>The database engine jar file.</dd>
+</dlentry></dl></info></step>
 <step><cmd>Test the CLASSPATH settings by running the following Java command:
  </cmd><stepxmp><codeblock>java org.apache.derby.tools.sysinfo</codeblock></stepxmp>
 <stepresult>This command displays the <ph conref="adminconrefs.dita#prod/productshortname"></ph> jar
-files that are in the CLASSPATH.</stepresult></step>
-<step><cmd>After you have set up your environment correctly, execute the application
-from the same directory:  </cmd><stepxmp><codeblock>java SimpleNetworkServerSample</codeblock></stepxmp>
-<stepresult>You should receive output similar to the following if the program
-runs successfully: <codeblock>Starting Network Server
+files that are in the classpath.</stepresult></step>
+<step><cmd>After you set up your environment correctly, run the SimpleNetworkServerSample
+program from the same directory:  </cmd><stepxmp><codeblock>java SimpleNetworkServerSample</codeblock></stepxmp>
+<stepresult>If the program runs successfully, you will receive output that
+is similar to that shown in the following exampleS: <codeblock>Starting Network Server
 Testing if Network Server is up and running!
 <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server now running
 Got an embedded connection.
@@ -59,12 +57,14 @@
 Clients can continue to connect:
 Press [Enter] to stop Server</codeblock></stepresult></step>
 </steps>
-<result><p>Running the SimpleNetworkServerSample program will also create
-the following new directories and files:  <ul>
-<li>NSSimpleDB <p>This directory makes up the NSSimpleDB database.</p></li>
-<li>derby.log  <p>This log file contains <ph conref="adminconrefs.dita#prod/productshortname"></ph> progress
-and error messages.</p></li>
-</ul></p></result>
+<result><p>Running the SimpleNetworkServerSample program also creates the
+following new directories and files:  <dl><dlentry>
+<dt>NSSimpleDB</dt>
+<dd>This directory makes up the NSSimpleDB database.</dd>
+</dlentry><dlentry>
+<dt>derby.log</dt>
+<dd>This log file contains <ph conref="adminconrefs.dita#prod/productshortname"></ph> progress
+and error messages.</dd>
+</dlentry></dl></p></result>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminspace43.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminspace43.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminspace43.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminspace43.dita Tue Jun 28 15:46:15 2005
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
- "../dtd/task.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.
--->
-<task id="tadminspace43" xml:lang="en-us">
-<title>Reclaiming unused space</title>
-<prolog><metadata>
-<keywords><indexterm>Compressing tables and indexes</indexterm></keywords>
-</metadata></prolog>
-<taskbody>
-<context> <p>If you determine that a table and its indexes have a significant
-amount of unused space, use the SYSCS_UTIL.SYSCS_COMPRESS_TABLE procedure
-to reclaim that space. The procedure returns the reclaimed space to the operating
-system. By default, the SYSCS_UTIL.SYSCS_COMPRESS_TABLE procedure instructs <ph
-conref="adminconrefs.dita#prod/productshortname"></ph> to compress the table
-and its related indexes concurrently, which can use a lot of temporary disk
-space and memory.</p></context>
-<example><p> For example, after you have determined that the FlightAvailability
-table and its related indexes have too much unused space, you could reclaim
-that space with the following command:</p><codeblock>call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('APP', 'FLIGHTAVAILABILITY', 0);</codeblock><p> The
-third parameter in the SYSCS_UTIL.SYSCS_COMPRESS_TABLE() procedure determines
-whether the operation will run in sequential or non-sequential mode. If you
-specify <codeph>0</codeph> for the third argument in the procedure, the operation
-will run in non-sequential mode. In sequential mode,<ph conref="adminconrefs.dita#prod/productshortname"></ph> compresses
-the table and indexes sequentially, one at a time. Sequential compression
-uses less memory and disk space but is slower. To force the operation to run
-in sequential mode, substitute a non-zero smallint value for the third argument.
-The following example shows how to force the procedure to run in sequential
-mode:</p><codeblock>call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('APP', 'FLIGHTAVAILABILITY', 1);</codeblock></example>
-<postreq>For more information about this command, see the <cite><ph conref="adminconrefs.dita#pub/citref"></ph></cite>.</postreq>
-</taskbody>
-</task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadmintracefacility.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadmintracefacility.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadmintracefacility.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadmintracefacility.dita Tue Jun 28 15:46:15 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -25,11 +24,9 @@
 </keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>You will use the trace facility only if you are working with
-technical support and they require the additional information provided in
-this file.</p> </context>
+<context> <p>Use the trace facility only if you are working with technical
+support and they require tracing information.</p> </context>
 <postreq><p>See <xref href="cadminservlet98430.dita#cadminservlet98430"></xref> for
 information about managing the trace facility using the servlet interface. </p></postreq>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/devguide/cdevadvjdbc32436.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevadvjdbc32436.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevadvjdbc32436.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevadvjdbc32436.dita Tue Jun 28 15:46:15 2005
@@ -34,6 +34,5 @@
 (<i>org.apache.derby.jdbc.EmbeddedDriver</i>; see <xref href="cdevdvlp40170.dita#cdevdvlp40170"/>) and connection URL (<codeph><i>jdbc:derby:databaseName</i></codeph>; see <xref href="rdevdvlp38881.dita#rdevdvlp38881"/>). If you use this
 driver name or connection URL from the IDE, when the IDE tries to open a second connection
 to the same database with the embedded <ph conref="devconrefs.dita#prod/productshortname"></ph>, the attempt fails. Two
-JVMs cannot connect to the same database in embedded mode. This situation
-is described in more detail in <xref href="cdevadvjdbc18939.dita#cdevadvjdbc18939"/>.</p>
+JVMs cannot connect to the same database in embedded mode.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevadvjdbc35053.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevadvjdbc35053.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevadvjdbc35053.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevadvjdbc35053.dita Tue Jun 28 15:46:15 2005
@@ -17,13 +17,8 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevadvjdbc35053">
 <title>Developing Tools and Using Derby with an IDE</title>
-<prolog>
-</prolog>
 <conbody>
 <p>Applications such as database tools are designed to work with databases
-whose schemas and contents are unknown in advance. This chapter discusses
+whose schemas and contents are unknown in advance. This section discusses
 a few topics useful for such applications.</p>
-<ul>
-<li><xref href="cdevadvjdbc41138.dita#cdevadvjdbc41138"/></li>
-</ul>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevbabejgjd.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevbabejgjd.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevbabejgjd.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevbabejgjd.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,17 +16,66 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevbabejgjd">
+<concept id="cdevbabejgjd" xml:lang="en-us">
 <title>Granting permissions to Derby</title>
+<shortdesc>This section discusses which permissions should be granted to <ph
+conref="devconrefs.dita#prod/productshortname"></ph> (the code base derby.jar).</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Permissions<indexterm>granting to Derby</indexterm></indexterm>
+<keywords><indexterm>Permissions<indexterm>granting to Derby</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p>The following section discusses which permissions should be granted to <ph conref="devconrefs.dita#prod/productshortname"></ph> (the
-code base <i>derby.jar</i>).</p>
-<p>See Default Policy Implementation and Policy File Syntax at <synph><var>http://java.sun.com/j2se/1.4.2/docs/guide/security/PolicyFiles.html</var></synph> for more information about creating policy files.</p>
-</conbody></concept>
+<p>See Default Policy Implementation and Policy File Syntax at <synph><var>http://java.sun.com/j2se/1.4.2/docs/guide/security/PolicyFiles.html</var
+></synph> for more information about creating policy files.</p>
+<section><title>Mandatory permissions</title><dl><dlentry>
+<dt>permission java.lang.RuntimePermission createClassLoader</dt>
+<dd>Mandatory. It allows <ph conref="devconrefs.dita#prod/productshortname"></ph> to
+execute SQL queries and supports loading class files from jar files stored
+in the database.</dd>
+</dlentry><dlentry>
+<dt>permission java.util.PropertyPermission "derby.*", read</dt>
+<dd>Allows <ph conref="devconrefs.dita#prod/productshortname"></ph> to read
+individual <ph conref="devconrefs.dita#prod/productshortname"></ph> properties
+set in the JVM's system set. If the action is denied, properties in the JVM's
+system set are ignored.</dd>
+</dlentry></dl></section>
+<section><title>Database access permissions</title><dl><dlentry>
+<dt>permission java.io.FilePermission "directory${/}/-", "read,write,delete"</dt>
+<dd>Allows <ph conref="devconrefs.dita#prod/productshortname"></ph> to manage
+files within the database that maps to the directory specified. For read-only
+databases, only the "read" action needs to be granted.</dd>
+</dlentry></dl></section>
+<section><title>Optional permissions</title><dl><dlentry>
+<dt>permission java.io.FilePermission "${derby.system.home}", "read,write"</dt>
+<dd>Allows <ph conref="devconrefs.dita#prod/productshortname"></ph> to determine
+the system directory when set by d<i>b2j.system.home </i>and create it if
+needed. If the system directory already exists then only the "read" permission
+needs to be granted.</dd>
+</dlentry><dlentry>
+<dt>permission java.util.PropertyPermission "user.dir", "read"</dt>
+<dd>Permits access to the system directory value if <i>derby.system.home</i> is
+not set or no permission has been granted to read the <codeph><i>derby.system.home</i></codeph> property.</dd>
+</dlentry><dlentry>
+<dt>permission java.io.FilePermission "${derby.system.home}${/}derby.properties",
+"read"</dt>
+<dd>Allows <ph conref="devconrefs.dita#prod/productshortname"></ph> to read
+the system properties file from the system directory.</dd>
+</dlentry><dlentry>
+<dt>permission java.io.FilePermission "${derby.system.home}${/}derby.log",
+"read,write,delete"</dt>
+<dt>permission java.io.FilePermission "${user.dir}${/}derby.log", "read,write,delete"</dt>
+<dd>Only one of these permissions is needed. Permits the application to read,
+write, and delete to the <ph conref="devconrefs.dita#prod/productshortname"></ph> log
+file, unless the log has been re-directed. (See the <i>derby.stream.error </i>properties
+in <cite><ph conref="devconrefs.dita#pub/cittuning"></ph></cite> for more
+information.) If one of the requested valid actions is denied, the <ph conref="devconrefs.dita#prod/productshortname"></ph> log
+will be <codeph><i>java.lang.System.err</i></codeph>.</dd>
+</dlentry></dl></section>
+<section><title>Combining permissions</title><p>You might grant one <i>FilePermission</i> that
+encompasses several or all of the permissions instead of separately granting
+a number of the more specific permissions. For example:<codeblock>permission java.io.FilePermission "${derby.system.home}/-", "read,write,delete"</codeblock
+>This allows the <ph conref="devconrefs.dita#prod/productshortname"></ph> engine
+complete access to the system directory and any databases contained in the
+system directory.</p></section>
+</conbody>
+</concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevcbabejdfj.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevcbabejdfj.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevcbabejdfj.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevcbabejdfj.dita Tue Jun 28 15:46:15 2005
@@ -17,6 +17,9 @@
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevcbabejdfj">
 <title>Running Derby under a security manager</title>
+<shortdesc>When running within an application or application server with a Java 2
+Security Manager enabled, <ph conref="devconrefs.dita#prod/productshortname"></ph> must be granted certain permissions
+to execute and access database files.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>Policy files<indexterm>and Derby permissions</indexterm></indexterm>
@@ -25,14 +28,7 @@
 </metadata>
 </prolog>
 <conbody>
-<p>When running within an application or application server with a Java 2
-Security Manager enabled, <ph conref="devconrefs.dita#prod/productshortname"></ph> must be granted certain permissions
-to execute and access database files. Those permissions are described in "<xref href="cdevbabejgjd.dita#cdevbabejgjd"/>", below.</p>
 <p>For more information about permissions and examples of creating permission
 objects and granting permissions, see the Security Architecture specification
 at <synph><var>http://java.sun.com/j2se/1.4.2/docs/guide/security/PolicyFiles.html</var></synph>.</p>
-<ul>
-<li><xref href="cdevbabejgjd.dita#cdevbabejgjd"/></li>
-<li><xref href="cdevcsecure871387.dita#cdevcsecure871387"/></li>
-</ul>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts15366.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts15366.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts15366.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts15366.dita Tue Jun 28 15:46:15 2005
@@ -21,14 +21,12 @@
 <title>Isolation levels and concurrency</title>
 <prolog><metadata>
 <keywords><indexterm>Transaction anomalies in generic database systems<indexterm>description</indexterm></indexterm>
-<indexterm>java.sql.Connection.TRANSACTION_READ_UNCOMMITTED</indexterm><indexterm>java.sql.Connection.TRANSACTION_READ_COMMITTED</indexterm>
-<indexterm>java.sql.Connection.TRANSACTION_READ_COMMITTED</indexterm>
-<indexterm>java.sql.Connection.TRANSACTION_SERIALIZABLE</indexterm><indexterm>Dirty
+<indexterm>Dirty
 reads<indexterm>definition</indexterm></indexterm><indexterm>Non-repeatable
 reads<indexterm>definition</indexterm></indexterm><indexterm>Phantom reads<indexterm>definition</indexterm></indexterm>
-<indexterm>TRANSACTION_SERIALIZABLE isolation level</indexterm><indexterm>TRANSACTION_REPEATABLE_READ
-isolation level</indexterm><indexterm>TRANSACTION_READ_COMMITTED isolation
-level</indexterm><indexterm>TRANSACTION_READ_UNCOMMITTED isolation level</indexterm>
+<indexterm>TRANSACTION_SERIALIZABLE isolation level</indexterm><indexterm>TRANSACTION_REPEATABLE _READ
+isolation level</indexterm><indexterm>TRANSACTION_READ _COMMITTED isolation
+level</indexterm><indexterm>TRANSACTION_READ _UNCOMMITTED isolation level</indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts19524.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts19524.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts19524.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts19524.dita Tue Jun 28 15:46:15 2005
@@ -16,17 +16,7 @@
 -->
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevconcepts19524">
-<title>Controlling Derby Application Behavior</title>
-<prolog>
-</prolog>
+<title>Controlling Derby application behavior</title>
 <conbody>
-<p>This chapter looks at some advanced <ph conref="devconrefs.dita#prod/productshortname"></ph> concepts:</p>
-<ul>
-<li><xref href="cdevconcepts38375.dita#cdevconcepts38375"/></li>
-<li><xref href="cdevconcepts41275.dita#cdevconcepts41275"/></li>
-<li><xref href="cdevconcepts30291.dita#cdevconcepts30291"/></li>
-<li><xref href="cdevconcepts34828.dita#cdevconcepts34828"/></li>
-<li><xref href="cdevconcepts23499.dita#cdevconcepts23499"/></li>
-<li><xref href="cdevconcepts24927.dita#cdevconcepts24927"/></li>
-</ul>
+<p>This section looks at some advanced <ph conref="devconrefs.dita#prod/productshortname"></ph> application concepts.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts23499.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts23499.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts23499.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts23499.dita Tue Jun 28 15:46:15 2005
@@ -26,9 +26,4 @@
 <conbody>
 <p>JDBC allows you to share a single <i>Connection</i> among
 multiple threads.</p>
-<ul>
-<li><xref href="cdevconcepts89498.dita#cdevconcepts89498"/></li>
-<li><xref href="cdevconcepts65864.dita#cdevconcepts65864"/></li>
-<li><xref href="rdevconcepts600.dita#rdevconcepts600"/></li>
-</ul>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts28351.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts28351.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts28351.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts28351.dita Tue Jun 28 15:46:15 2005
@@ -23,9 +23,4 @@
 <p>Cursors are read-only by default. For a cursor to be updatable, you must
 specify SELECT . . . FOR UPDATE. Use FOR UPDATE only when you will be modifying
 rows to avoid excessive locking of tables.</p>
-<ul>
-<li><xref href="cdevconcepts30811.dita#cdevconcepts30811"/></li>
-<li><xref href="tdevconcepts41704.dita#tdevconcepts41704"/></li>
-<li><xref href="rdevconcepts38274.dita#rdevconcepts38274"/></li>
-</ul>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts28436.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts28436.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts28436.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts28436.dita Tue Jun 28 15:46:15 2005
@@ -35,12 +35,4 @@
 one of the transactions.</p>
 <fig expanse="column">
 <title>A deadlock.</title><image placement="break" href="dead.gif"><alt>This figure depicts a deadlock, where two transactions are waiting for one another to give up locks.</alt></image></fig>
-<ul>
-<li><xref href="cdevconcepts53677.dita#cdevconcepts53677"/></li>
-<li><xref href="cdevconcepts95005.dita#cdevconcepts95005"/></li>
-<li><xref href="cdevconcepts89097.dita#cdevconcepts89097"/></li>
-<li><xref href="cdevconcepts16400.dita#cdevconcepts16400"/></li>
-<li><xref href="cdevconcepts50894.dita#cdevconcepts50894"/></li>
-<li><xref href="cdevconcepts32861.dita#cdevconcepts32861"/></li>
-</ul>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts30291.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts30291.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts30291.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts30291.dita Tue Jun 28 15:46:15 2005
@@ -31,11 +31,4 @@
 concurrency is important. <ph conref="devconrefs.dita#prod/productshortname"></ph> is configured by default to work well
 for multi-user systems. For single-user systems, you might want to tune your
 system so that it uses fewer resources; see <xref href="cdevconcepts23810.dita#cdevconcepts23810"/>.</p>
-<ul>
-<li><xref href="cdevconcepts15366.dita#cdevconcepts15366"/></li>
-<li><xref href="cdevconcepts22300.dita#cdevconcepts22300"/></li>
-<li><xref href="cdevconcepts23810.dita#cdevconcepts23810"/></li>
-<li><xref href="cdevconcepts36402.dita#cdevconcepts36402"/></li>
-<li><xref href="cdevconcepts28436.dita#cdevconcepts28436"/></li>
-</ul>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts32861.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts32861.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts32861.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts32861.dita Tue Jun 28 15:46:15 2005
@@ -49,7 +49,7 @@
 <b>// note: do not catch such exceptions in database-side methods; 
 // catch such exceptions only at the outermost level of 
 // application code. 
-// See <xref href="cdevspecial41728.dita#cdevspecial41728"/>. </b> 
+// See <xref href="cdevspecial41728.dita#cdevspecial41728">Database-side JDBC procedures and SQLExceptions</xref>. </b> 
 catch (SQLException se) { 
     if (se.getSQLState().equals("40001")) { 
         <b>// it was chosen as a victim of a deadlock. 

Modified: incubator/derby/docs/trunk/src/devguide/cdevconcepts34828.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/cdevconcepts34828.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/cdevconcepts34828.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/cdevconcepts34828.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,19 +16,14 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cdevconcepts34828">
+<concept id="cdevconcepts34828" xml:lang="en-us">
 <title>Working with multiple connections to a single database</title>
 <prolog><metadata>
-<keywords>
-<indexterm>Multiple connections<indexterm>in single application</indexterm></indexterm>
+<keywords><indexterm>Multiple connections<indexterm>in single application</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<ul>
-<li><xref href="rdevconcepts713.dita#rdevconcepts713"/></li>
-<li><xref href="cdevconcepts10914.dita#cdevconcepts10914"/></li>
-<li><xref href="cdevconcepts24019.dita#cdevconcepts24019"/></li>
-</ul>
-</conbody></concept>
+<p>This section discusses deploying <ph conref="devconrefs.dita#prod/productshortname"></ph> so
+that many connections can exist to a single database.</p>
+</conbody>
+</concept>



Mime
View raw message