db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r191746 - /incubator/derby/docs/trunk/src/adminguide/
Date Tue, 21 Jun 2005 23:39:53 GMT
Author: jta
Date: Tue Jun 21 16:39:52 2005
New Revision: 191746

URL: http://svn.apache.org/viewcvs?rev=191746&view=rev
Log:
DERBY-373 Applied Jeff Levitt's patch that fixes documentation errors in
the Server/Admin Guide.

Modified:
    incubator/derby/docs/trunk/src/adminguide/cadminapps.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita
    incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita
    incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
    incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfig.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita
    incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita
    incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita
    incubator/derby/docs/trunk/src/adminguide/radminservlet810850.dita
    incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita
    incubator/derby/docs/trunk/src/adminguide/tadminadv804451.dita
    incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita
    incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita
    incubator/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig813694.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig814963.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita
    incubator/derby/docs/trunk/src/adminguide/tadmincrtdbbkup.dita
    incubator/derby/docs/trunk/src/adminguide/tadminhubbkup44.dita

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps.dita Tue Jun 21 16:39:52 2005
@@ -17,8 +17,8 @@
 limitations under the License.
 -->
 <concept id="cadminapps" xml:lang="en-us">
-<title>Differences between running Derby in embedded mode and using the network
-server</title>
+<title>Differences between running Derby in embedded mode and using the Network
+Server</title>
 <prolog><metadata>
 <keywords><indexterm>Network Server<indexterm>Derby features not supported
 in</indexterm></indexterm></keywords>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita Tue Jun 21 16:39:52 2005
@@ -25,7 +25,12 @@
 to load the driver and connection URL specific to the Network Server. In addition,
 you specify a user name and password. If you have not set up authentication,
 you can use any value for the user name and password. The driver you use 
-to access the Network Server is: <codeblock>com.ibm.db2.jcc.DB2Driver</codeblock></p>
+to access the Network Server is: <codeblock>com.ibm.db2.jcc.DB2Driver</codeblock>You
+must have the following two jar files present in your classpath in order to
+use the DB2 Universal Driver:<ul>
+<li><codeph>db2jcc.jar</codeph></li>
+<li><codeph>db2jcc_license_c.jar</codeph></li>
+</ul></p>
 <p>The URL that is needed to access the Network Server is:</p>
 <codeblock>jdbc:derby:net://&lt;<i>server</i>&gt;[:&lt;<i>port</i>&gt;]/
 &lt;<i>databaseName</i>&gt;[;&lt;<ph conref="adminconrefs.dita#prod/productshortname"></ph> URL attribute&gt;=&lt;value&gt; [;...]]
@@ -54,9 +59,8 @@
 <li><i>Universal Driver Attribute=value</i>   <p>Optional database connection
 URL attributes supported by the DB2 Universal JDBC Driver.</p><p>The DB2 JDBC
 Universal Driver requires that you set the Universal Driver user and password
-attributes to non-null values.</p><p>Here is a list of the DB2
-Universal JDBC Driver attributes available to you when running the Network
-Server:</p><ul>
+attributes to non-null values.</p><p>Here is a list of the DB2 Universal JDBC
+Driver attributes available to you when running the Network Server:</p><ul>
 <li><i>user </i>   <p>User name (required by the Universal JDBC Driver).</p></li>
 <li><i>password</i>   <p>User password (required by the Universal JDBC Driver).</p></li>
 <li><i>portNumber</i>   <p>The TCP/IP port number where the Network Server
@@ -79,4 +83,3 @@
 Server is compatible with the DB2 JDBC Universal Driver release 1.2 and higher.</p></section>
 </conbody>
 </concept>
-

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita Tue Jun 21 16:39:52 2005
@@ -17,23 +17,18 @@
 limitations under the License.
 -->
 <concept id="cadminappsclient" xml:lang="en-us">
-<title>Accessing the Network Server by using the Network Client driver</title>
+<title>Accessing the Network Server by using the network client driver</title>
 <prolog></prolog>
 <conbody>
 <p>When connecting to the Network Server, your application needs to load a
 driver and connection URL specific to the Network Server. In addition, you
-specify a user name and password. If you have not set up authentication, you
-can use any value for the user name and password. The driver you need to access
-the Network Server is: <codeblock>org.apache.derby.jdbc.ClientDriver</codeblock></p>
-<p>The URL that is needed to access the Network Server is:</p>
-<codeblock>jdbc:derby://&lt;<i>server</i>&gt;[:&lt;<i>port</i>&gt;]/
-&lt;<i>databaseName</i>&gt;[;&lt;<ph conref="adminconrefs.dita#prod/productshortname"></ph> URL attribute&gt;=&lt;value&gt; [;...]]
-[:&lt;Client Driver attribute&gt;=&lt;value&gt;; [...;]]</codeblock>
-<p>The syntax for connection to the Network Server differs slightly from the
-syntax used to connect to <ph conref="adminconrefs.dita#prod/productshortname"></ph> running
-in embedded mode. After the database name and attributes you can include attributes
-for the Network Client driver. You must include a semicolon after the last
-Network Client attribute.</p>
+specify a user name and password if you are using authentication. The driver
+you need to access the Network Server is: <codeblock>org.apache.derby.jdbc.ClientDriver</codeblock></p>
+<p>The URL that is needed to access the Network Server is:<codeblock>jdbc:derby://&lt;<i>server</i>&gt;[:&lt;<i>port</i>&gt;]/
+&lt;<i>databaseName</i>&gt;[;&lt;URL attribute&gt;=&lt;value&gt; [;...]]
+</codeblock>where the <codeph>&lt;URL attribute&gt;</codeph> is either a <ph
+conref="adminconrefs.dita#prod/productshortname"></ph> embedded or network
+client attribute.</p>
 <table><title>Standard JDBC DataSource properties</title>
 <tgroup cols="5"><colspec colname="col1"/><colspec colname="col2"/><colspec
 colname="col3"/><colspec colname="COLSPEC0" colwidth="1*"/><colspec colname="col4"/>
@@ -198,4 +193,3 @@
 DataSource, is not available for the client DataSource.</p>
 </conbody>
 </concept>
-

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita Tue Jun 21 16:39:52 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
-
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -18,9 +17,9 @@
 limitations under the License.
 -->
 <reference id="cadminappsclienttracing" xml:lang="en-us">
-<title>Network Client tracing</title>
+<title>Network client tracing</title>
 <shortdesc>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Client provides a tracing facility to collect JDBC trace information and view
+client provides a tracing facility to collect JDBC trace information and view
 protocol flows.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Network Client tracing</indexterm></keywords>
@@ -51,7 +50,7 @@
 <section><title>Changing the default trace level</title><p>The trace level
 defaults to <codeph>ClientDataSource.TRACE_ALL</codeph>. The tracing can be
 changed by calling the <codeph>setTraceLevel(int level)</codeph> method or
-setting the <codeph>traceLevel</codeph> URL attribute:<codeblock>String url = "jdbc:derby://myhost.mydomain.com:1528/mydb" +
+setting the <codeph>traceLevel</codeph> URL attribute:<codeblock>String url = "jdbc:derby://samplehost.sampledomain.com:1528/mydb" +
  ";traceFile=/u/user1/trace.out" +
  ";traceLevel=" +
  org.apache.derby.jdbc.ClientDataSource.TRACE_PROTOCOL_FLOWS;
@@ -125,4 +124,3 @@
 </ul></p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita Tue Jun 21 16:39:52 2005
@@ -1,8 +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.  
 
@@ -18,24 +16,27 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
 <concept id="cadminappsxawthdriver" xml:lang="en-us">
-<title>Using XA with the Network Client driver</title>
+<title>Using XA with the network client driver</title>
 <prolog><metadata>
-<keywords><indexterm>XA<indexterm>Using with the Network Client driver</indexterm></indexterm>
+<keywords><indexterm>XA<indexterm>Using with the network client driver</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
 <section><p>You can access XA support for the Network Server by using the
-Network Client driver's XA DataSource interface (<codeph>org.apache.derby.jdbc.ClientXADataSource</codeph>).</p></section>
+network client driver's XA DataSource interface (<codeph>org.apache.derby.jdbc.ClientXADataSource</codeph>).</p></section>
 <example><p>The following example illustrates how to obtain an XA connection
-with the Network Client driver:</p><codeblock>XAConnection xaConnection = null;
+with the network client driver:</p><codeblock>import org.apache.derby.jdbc.ClientXADataSource;
+import javax.sql.XAConnection;
+...
+
+XAConnection xaConnection = null;
 Connection conn = null;
 
-	String driver = "org.apache.derby.jdbc.ClientDataSource";
-	ClientXADataSource ds = new ClientXADataSource();
+String driver = "org.apache.derby.jdbc.ClientDataSource";
+ClientXADataSource ds = new ClientXADataSource();
 
-		ds.setDatabaseName (dbname + ";create=true");
+ds.setDatabaseName ("sample;create=true");
 
 ds.setServerName("localhost");
 
@@ -43,9 +44,8 @@
 
 Class.forName(driver);
 
-	xaConnection = ds.getXAConnection("auser", "shhhh");
+xaConnection = ds.getXAConnection("auser", "shhhh");
 
-	connection = xaConnection.getConnection();</codeblock></example>
+conn = xaConnection.getConnection();</codeblock></example>
 </conbody>
 </concept>
-

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita Tue Jun 21 16:39:52 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -17,7 +16,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
 <concept id="cadminhubbkup01" xml:lang="en-us">
 <title>Using the backup procedure</title>
 <prolog><metadata>
@@ -44,7 +42,12 @@
 that reflects the current date:</p>
 <codeblock>public static void backUpDatabase(Connection conn)throws SQLException
 {
-String backupdirectory ="c:/mybackups/"+JCalendar.getToday();
+<b>// Get today's date as a string:</b>
+java.text.SimpleDateFormat todaysDate = 
+   new java.text.SimpleDateFormat("yyyy-MM-dd");
+String backupdirectory = "c:/mybacksup/" +
+   todaysDate.format((java.util.Calendar.getInstance()).getTime());
+
 CallableStatement cs = conn.prepareCall("CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE(?)"); 
 cs.setString(1, backupdirectory);
 cs.execute(); 
@@ -57,8 +60,5 @@
 <note>Do not back up different databases with the same name to the same backup
 directory. If a database of the same name already exists in the backup directory,
 it is assumed to be an older version and is overwritten.</note>
-<note>If you are doing this through the Network Server, refer to the workaround
-in <xref href="cadminapps.dita#cadminapps"></xref>.</note>
 </conbody>
 </concept>
-

Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita Tue Jun 21 16:39:52 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,9 +16,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
 <concept id="cadminhubbkup75469" xml:lang="en-us">
 <title>Using operating system commands with the freeze and unfreeze system
 procedures</title>
@@ -27,35 +26,37 @@
 </metadata></prolog>
 <conbody>
 <p>Typically, this procedure is used to speed up the copy operation involved
-in the online backup. In this scenario, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does not perform the copy operation
-for you. You use the <i>SYSCS_UTIL.SYSCS_FREEZE_DATABASE()</i> procedure to
-lock the database, and then explicitly copy the database directory using operating
-system commands. </p>
+in the online backup. In this scenario, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does
+not perform the copy operation for you. You use the <i>SYSCS_UTIL.SYSCS_FREEZE_DATABASE()</i> procedure
+to lock the database, and then explicitly copy the database directory using
+operating system commands. </p>
 <p>For example, because the UNIX <i>tar</i> command uses operating system
-file-copying routines and <ph conref="adminconrefs.dita#prod/productshortname"></ph> uses the IBM Application Developer Kit file-copying
-routines, tar might provide faster backups than the <i>SYSCS_UTIL.SYSCS_BACKUP_DATABASE</i> procedure.</p>
+file-copying routines and <ph conref="adminconrefs.dita#prod/productshortname"></ph> uses
+the IBM Application Developer Kit file-copying routines, tar might provide
+faster backups than the <i>SYSCS_UTIL.SYSCS_BACKUP_DATABASE</i> procedure.</p>
 <p>To use operating system commands for online database backups, call the <i>SYSCS_UTIL.SYSCS_FREEZE_DATABASE()</i> system
 procedure. The <i>SYSCS_UTIL.SYSCS_FREEZE_DATABASE()</i> system procedure
 puts the database into a state in which it can be safely copied. After the
-copy is complete, use the <i>SYSCS_UTIL.SYSCS_FREEZE_DATABASE()</i> system
-procedure to continue working with the database. Only after <i>SYSCS_UTIL.SYSCS_FREEZE_DATABASE()</i> has
+copy is complete, use the <i>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE()</i> system
+procedure to continue working with the database. Only after <i>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE()</i> has
 been specified can transactions once again write to the database. Read operations
 can proceed while the database is "frozen".</p>
-<note>To ensure a consistent backup of the database, <ph conref="adminconrefs.dita#prod/productshortname"></ph> might block applications
-that attempt to write to a "frozen" database until the back up is completed
-and the <i>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE()</i>system procedure is called.</note>
+<note>To ensure a consistent backup of the database, <ph conref="adminconrefs.dita#prod/productshortname"></ph> might
+block applications that attempt to write to a "frozen" database until the
+back up is completed and the <i>SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE()</i> system
+procedure is called.</note>
 <p>The following example demonstrates using <i>freeze</i> and <i>unfreeze</i> surrounding
 an operating system copy command:</p>
-<codeblock>String backupdirectory = "c:/mybackups/" + JCalendar.getToday();
+<codeblock>public static void backUpDatabaseWithFreeze(Connection conn)
+	throws SQLException
+{
 Statement s = conn.createStatement();
 s.executeUpdate(
-    "CALL SYSCS_UTIL.SYSCS_FREEZE_DATABASE();
+    "CALL SYSCS_UTIL.SYSCS_FREEZE_DATABASE()");
 <b>//copy the database directory during this interval</b>
 s.executeUpdate(
-    "CALL SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE();
-s.close();</codeblock>
-<note>If you are doing this through the Network Server, refer to the workaround
-in <xref href="cadminapps.dita#cadminapps"></xref>.</note>
+    "CALL SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE()");
+s.close();
+}</codeblock>
 </conbody>
 </concept>
-

Modified: incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap (original)
+++ incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap Tue Jun 21 16:39:52 2005
@@ -72,6 +72,12 @@
 <topicref href="tadminconfig814963.dita" navtitle="Starting the Network Server from a Java application">
 </topicref>
 </topicref>
+<topicref href="tadminconfigshuttingdownthenetworkserver.dita" navtitle="Shutting down the Network Server">
+<topicref href="tadminconfig815333.dita" navtitle="Shutting down by using the command line">
+</topicref>
+<topicref href="tadminconfig815357.dita" navtitle="Shutting down by using the API">
+</topicref>
+</topicref>
 <topicref href="tadminconfigsysteminformation.dita" navtitle="Obtaining system information">
 <topicref href="tadminconfig815768.dita" navtitle="Obtaining system information using the command line">
 </topicref>
@@ -155,12 +161,6 @@
 </topicref>
 <topicref href="tadminconfigverifyingstartup.dita" navtitle="Verifying Startup">
 </topicref>
-<topicref href="tadminconfigshuttingdownthenetworkserver.dita" navtitle="Shutting down the Network Server">
-<topicref href="tadminconfig815333.dita" navtitle="Shutting down by using the command line">
-</topicref>
-<topicref href="tadminconfig815357.dita" navtitle="Shutting down by using the API">
-</topicref>
-</topicref>
 </topicref>
 <topicref href="cadminservlet98430.dita" navtitle="Managing the Derby Network Server remotely using the servlet interface">
 <topicref href="radminservlet810694.dita" navtitle="Start-up page"></topicref>
@@ -168,7 +168,6 @@
 <topicref href="radminservlet810796.dita" navtitle="Trace session page"></topicref>
 <topicref href="radminservlet810822.dita" navtitle="Trace directory page">
 </topicref>
-<topicref href="radminservlet810850.dita" navtitle="Test connection"></topicref>
 <topicref href="radminservlet810910.dita" navtitle="Set Network Server parameters">
 </topicref>
 </topicref>
@@ -255,4 +254,3 @@
 </topicref>
 <topicref href="radmintrademderby.dita" navtitle="Trademarks"></topicref>
 </map>
-

Modified: incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita Tue Jun 21 16:39:52 2005
@@ -17,22 +17,20 @@
 limitations under the License.
 -->
 <reference id="radminappsclientxmp" xml:lang="en-us">
-<title>Network Client driver examples</title>
+<title>Network client driver examples</title>
 <refbody>
 <section><title>Example 1</title><p>The following example connects to the
 default server name <i>localhost</i> on the default port, <i>1527</i>, and
 to the database <i>sample</i>. It specifies the <i>user</i> and <i>password</i> URL
 attributes. You must set these attributes before attempting to connect to
-the server.</p><codeblock>jdbc:derby://localhost:1527/sample:user=judy;password=no12see;</codeblock></section>
+the server.</p><codeblock>jdbc:derby://localhost:1527/sample;user=judy;password=no12see;</codeblock></section>
 <section><title>Example 2</title><p>The following example specifies both <ph
 conref="adminconrefs.dita#prod/productshortname"></ph> and Network Client
-driver attributes:  <codeblock>jdbc:derby://localhost:1527/sample;create=true:user=judy;
+driver attributes:  <codeblock>jdbc:derby://localhost:1527/sample;create=true;user=judy;
 password=no12see;</codeblock></p></section>
 <section><title>Example 3</title><p>This example connects to the default server
 name <i>localhost</i> on the default port, <i>1527</i>, and includes the path
-in the database name portion of the URL. The database name must be delimited
-by double quotes and you cannot specify <ph conref="adminconrefs.dita#prod/productshortname"></ph> attributes
-on the URL.</p><codeblock>jdbc:derby://localhost:1527/"c:/my-db-dir/my-db-name":user=judy;
+in the database name portion of the URL.</p><codeblock>jdbc:derby://localhost:1527/c:/my-db-dir/my-db-name;user=judy;
 password=no12see;</codeblock></section>
 <section><title>Example 4</title><p>The following is a sample program fragment
 that connects to the Network Server using the Network Client driver:</p><codeblock>String databaseURL = "jdbc:derby://localhost:1527/sample";
@@ -46,4 +44,3 @@
 Connection conn = DriverManager.getConnection(databaseURL, properties); </codeblock></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfig.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfig.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfig.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfig.dita Tue Jun 21 16:39:52 2005
@@ -24,7 +24,7 @@
 </metadata></prolog>
 <refbody>
 <section>Turns tracing on for all sessions.</section>
-<refsyn><title>Syntax</title> <codeblock>&lt;derby.drda.traceAll=[true|false]&gt;;</codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock>derby.drda.traceAll=[true|false]</codeblock> </refsyn>
 <section><title>Default</title> <p>False.</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.traceAll=true</b></codeblock> </example>
 <section><title>Static or Dynamic</title> <p>Dynamic. System values can be

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita Tue Jun 21 16:39:52 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -24,12 +23,11 @@
 </metadata></prolog>
 <refbody>
 <section>Indicates whether to log connections and disconnections. </section>
-<refsyn><title>Syntax</title> <codeblock>&lt;derby.drda.logConnections=[true|false]&gt;t;</codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock>derby.drda.logConnections=[true|false]</codeblock> </refsyn>
 <section><title>Default</title> <p>False.</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.logConnections=true </b></codeblock></example>
-<section><title>Static or Dynamic</title> <p>Dynamic. System values can be
+<section><title>Static or Dynamic</title><p>Dynamic. System values can be
 changed using commands or the servlet interface after the Network Server has
 been started.</p> </section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita Tue Jun 21 16:39:52 2005
@@ -24,7 +24,7 @@
 </metadata></prolog>
 <refbody>
 <section>Indicates the location for tracing files. </section>
-<refsyn><title>Syntax</title> <codeblock>&lt;derby.drda.traceDirectory=<i>tracefiledirectory</i>&gt;;</codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock>derby.drda.traceDirectory=<i>tracefiledirectory</i></codeblock> </refsyn>
 <section><title>Default</title> <p>If the <i>derby.system.home</i> property
 has been set, it is the default. Otherwise, the default is the current directory.</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.traceDirectory=c:/<ph

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita Tue Jun 21 16:39:52 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -24,12 +23,11 @@
 </metadata></prolog>
 <refbody>
 <section>Indicates the port number to use. </section>
-<refsyn><title>Syntax</title> <codeblock>&lt;derby.drda.portNumber=<i>portnumber</i>&gt;;</codeblock> </refsyn>
-<section><title>Default</title> <p>If no port number is specified, 1527 is
+<refsyn><title>Syntax</title><codeblock>derby.drda.portNumber=<i>portnumber</i></codeblock> </refsyn>
+<section><title>Default</title><p>If no port number is specified, 1527 is
 the default.</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.portNumber=1110</b></codeblock> </example>
-<section><title>Static or Dynamic</title> <p>Static. You must restart the
-Network Server for changes to take effect.</p> </section>
+<section><title>Static or Dynamic</title><p>Static. You must restart the Network
+Server for changes to take effect.</p> </section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita Tue Jun 21 16:39:52 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -27,12 +26,11 @@
 embedding the Network Server in your application. When you set <i>derby.drda.startNetworkServer</i>,
 the Network Server will automatically start when you start <ph conref="adminconrefs.dita#prod/productshortname"></ph>.
 Only one Network Server can be started in a JVM.</section>
-<refsyn><title>Syntax</title> <codeblock>&lt;derby.drda.startNetworkServer=[true | false]&gt;</codeblock> </refsyn>
-<section><title>Default</title> <p>false</p> </section>
+<refsyn><title>Syntax</title><codeblock>derby.drda.startNetworkServer=[true | false]</codeblock> </refsyn>
+<section><title>Default</title><p>false</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.startNetworkServer=true</b></codeblock> </example>
-<section><title>Static or Dynamic</title> <p>Static. You must shut down the
+<section><title>Static or Dynamic</title><p>Static. You must shut down the
 Network Server and restart <ph conref="adminconrefs.dita#prod/productshortname"></ph> for
 this change to take effect.</p> </section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita Tue Jun 21 16:39:52 2005
@@ -31,7 +31,7 @@
 will listen on all interfaces. Ensure that you are running under the security
 manager and that you have user authorization enabled before enabling remote
 connections with this property. </section>
-<refsyn><title>Syntax</title> <codeblock>&lt;derby.drda.host = <i>hostname</i>&gt;;</codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock>derby.drda.host = <i>hostname</i></codeblock> </refsyn>
 <section><title>Default</title> <p>If no host is specified, the Network Server
 listens on the loopback address of the current machine (localhost).</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.host=myhost</b></codeblock> </example>

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita Tue Jun 21 16:39:52 2005
@@ -28,10 +28,10 @@
 threads are currently being used and the Network Server has already allocated
 the maximum amount of threads, then threads will be shared using the <i>derby.drda.timeslice</i> property
 to determine when sessions will be swapped.</section>
-<refsyn><title>Syntax</title> <codeblock>&lt;<ph>derby.drda.maxThreads=<i>numthreads</i></ph>&gt;;</codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock><ph>derby.drda.maxThreads=<i>numthreads</i></ph></codeblock> </refsyn>
 <section><title>Default</title> <p>1</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.maxThreads=50</b></codeblock> </example>
-<section><title>Static or Dynamic</title> <p>Static.</p> </section>
+<section><title>Static or Dynamic</title> <p>Static. You must restart the Network Server for changes to take effect.</p> </section>
 </refbody>
 </reference>
 

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita Tue Jun 21 16:39:52 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -26,10 +25,9 @@
 <section>Use the <i>derby.drda.minThreads</i> property to set a minimum number
 of connection threads that Network Server will allocate. By default, connection
 threads are allocated as needed.</section>
-<refsyn><title>Syntax</title> <codeblock>&lt;<ph>derby.drda.minThreads=<i>numthreads</i></ph>&gt;;</codeblock> </refsyn>
+<refsyn><title>Syntax</title><codeblock><ph>derby.drda.minThreads=<i>numthreads</i></ph></codeblock> </refsyn>
 <section><title>Default</title><p>1</p> </section>
 <example><title>Example</title><codeblock><b>derby.drda.minThreads=10</b></codeblock> </example>
-<section><title>Static or Dynamic</title> <p>Static.</p> </section>
+<section><title>Static or Dynamic</title> <p>Static. You must restart the Network Server for changes to take effect.</p> </section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita Tue Jun 21 16:39:52 2005
@@ -26,10 +26,10 @@
 <section>Use the <i>derby.drda.timeslice</i> to set the number of milliseconds
 each connection will use before yielding to another connection. This property
 is only relevant if the <i>derby.drda.maxThreads</i> property is set.</section>
-<refsyn><title>Syntax</title> <codeblock>&lt;<ph>derby.drda.timeslice=<i>milliseconds</i></ph>&gt;;</codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock><ph>derby.drda.timeslice=<i>milliseconds</i></ph></codeblock> </refsyn>
 <section><title>Default</title> <p>1</p> </section>
 <example> <title>Example</title><codeblock><b>derby.drda.timeslice=2000</b></codeblock> </example>
-<section><title>Static or Dynamic</title> <p>Static.</p> </section>
+<section><title>Static or Dynamic</title> <p>Static. You must restart the Network Server for changes to take effect.</p> </section>
 </refbody>
 </reference>
 

Modified: incubator/derby/docs/trunk/src/adminguide/radminservlet810850.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminservlet810850.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminservlet810850.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminservlet810850.dita Tue Jun 21 16:39:52 2005
@@ -1,36 +0,0 @@
-<?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="radminservlet810850">
-<title>Test connection </title>
-<prolog>
-</prolog>
-<refbody>
-<section><p>This page is displayed if the test connection button is pressed. </p></section>
-<section><p>Enter the following applicable information:</p></section><section>
-<ul>
-<li>Database Directory (optional).   
-<p>Specify a database to test connection
-to, or leave blank to test connecting to Network Server.</p></li>
-<li>UserID (required if user authentication is enabled) </li>
-<li>Password (required if user authentication is enabled)</li>
-</ul></section>
-<section><p>You are given the option to test the connection or return to the previous
-Menu.</p></section>
-<section><p>Information about the success or failure of the connection test will be
-displayed when the test connection button is pushed. </p></section>
-</refbody></reference>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita Tue Jun 21 16:39:52 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -22,10 +21,9 @@
 <taskbody>
 <steps>
 <step><cmd>Turn on tracing for all sessions by specifying the following property:</cmd>
-<stepxmp><codeblock>derby.drda.traceAll=true </codeblock></stepxmp></step>
-<step><cmd>While the Network Server is running, you can use the following
-command to turn on the trace facility:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl trace on [&lt;<i>connection number</i
->&gt;] 
+<stepxmp><codeblock>derby.drda.traceAll=true </codeblock>Alternatively, while
+the Network Server is running, you can use the following command to turn on
+the trace facility:<codeblock>java org.apache.derby.drda.NetworkServerControl trace on [-s &lt;<i>connection number</i>&gt;] 
 [-h &lt;<i>hostname</i>&gt;][-p &lt;<i>portnumber</i>&gt;] </codeblock></stepxmp>
 <info>If you specify a &lt;<i>connection number</i>&gt; then tracing will
 be turned on only for that connection.</info></step>
@@ -37,9 +35,8 @@
 in derby.system.home.</info></step>
 <step><cmd>While the Network Server is running, enter the following command
 to set the trace directory:</cmd><stepxmp><codeblock>java org.apache.derby.drda.NetworkServerControl traceDirectory 
-&lt;<i>directory for tracing files</i>&gt;[-h &lt;<i>hostname</i>&gt;] [-p &lt;<i>portnumber</i>&gt;]  </codeblock></stepxmp>
+&lt;<i>directory for tracing files</i>&gt;[-h &lt;<i>hostname</i>&gt;] [-p &lt;<i>portnumber</i>&gt;]  </codeblock> </stepxmp>
 </step>
 </steps>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminadv804451.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminadv804451.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminadv804451.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminadv804451.dita Tue Jun 21 16:39:52 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -20,10 +19,9 @@
 <task id="tadminadv804451" xml:lang="en-us">
 <title>Turning off the trace facility</title>
 <taskbody>
-<context> <p>You can turn off tracing with the following command:<codeblock>java org.apache.derby.drda.NetworkServerControl trace off [&lt;<i>connection number</i
+<context> <p>You can turn off tracing with the following command:<codeblock>java org.apache.derby.drda.NetworkServerControl trace off [-s &lt;<i>connection number</i
 >&gt;] 
-[-h &lt;<i>hostname</i>&gt;] [-p &lt;<i>portnumber</i>&gt;] </codeblock></p> <p>The
+[-h &lt;<i>hostname</i>&gt;] [-p &lt;<i>portnumber</i>&gt;] </codeblock></p><p>The
 tracing files are named Server.trace</p></context>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita Tue Jun 21 16:39:52 2005
@@ -27,8 +27,7 @@
 the Network Server is running (see <xref href="tadmincbdjhhfd.dita#tadmincbdjhhfd"></xref>),
 and then include the necessary <ph conref="adminconrefs.dita#prod/productshortname"></ph> and
 Network Client driver connection attributes as part of the database URL.</p></context>
-<example><codeblock>java org.apache.derby.tools.dblook -d'jdbc:derby://localhost:1527/sample:
-user=&lt;<i>yourusername</i>>;password=&lt;<i>yourpassword</i>>;'</codeblock></example>
+<example><codeblock>java org.apache.derby.tools.dblook -d 'jdbc:derby://localhost:1527/sample;
+user=user1;password=secret4me;'</codeblock></example>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita Tue Jun 21 16:39:52 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.  
 
@@ -32,7 +30,7 @@
 (Java Cryptography Extension) 1.2.1 or later. You can use it with any version
 of IBM or Sun's <ph><tm tmclass="special" tmowner="Sun Microsystems, Inc."
 tmtype="tm" trademark="Java">Java</tm> 2 Platform, Standard Edition, Version
-1.2 (J2SE)</ph>.</p> <p>IBM JDK 1.4 or later comes with IBM JCE, so you do
+1.2 (J2SE)</ph>.</p><p>IBM JDK 1.4 or later comes with IBM JCE, so you do
 not need to install IBM JCE separately. If you have an earlier version of
 IBM JDK or other JDK's, do the following:</p></context>
 <steps>
@@ -55,9 +53,8 @@
 the Network Server, users can connect to the database without giving the <codeph>bootPassword</codeph>.
 The first connection to the database must provide the <codeph>bootPassword</codeph>,
 but all subsequent connections do not need to supply it. To remove access
-from the encrypted database, use the <codeph>dbshutdown</codeph> option to
-shut down the database.</info></step>
+from the encrypted database, use the <codeph>shutdown=true</codeph> option
+to shut down the database.</info></step>
 </steps>
 </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=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita Tue Jun 21 16:39:52 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -24,13 +23,15 @@
 <indexterm>Network Server<indexterm>starting</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context> <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,
+<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,
 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>
+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
@@ -44,4 +45,3 @@
 the loopback address, so it will only accept connections from the local host.</p></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=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfig813694.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfig813694.dita Tue Jun 21 16:39:52 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -39,11 +38,10 @@
 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 = nwe NetworkServerControl(InetAddress.getByName("0.0.0.0"),1527) </codeblock> <codeblock>//accepts connections from other hosts on an IPV6 system
-NetworkServerControl serverControl = nwe NetworkServerControl(InetAddress.getByName("::"),1527) </codeblock></p><note>Before
+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>
 </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=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfig814963.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfig814963.dita Tue Jun 21 16:39:52 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -24,7 +23,9 @@
 </keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>There are two ways to start the Network Server from a Java application.</p> </context>
+<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>
 <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
@@ -37,11 +38,8 @@
 -Dderby.drda.portNumber=1110
 -Dderby.drda.host=myhost yourApp</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(null);
-server.start (null);</codeblock></stepxmp><info><note type="remember">The
-NetworkServerControl.start method does not return until the server
-is shut down, so you should run it in its own thread.</note> </info></step>
+from a separate thread within a Java application:  </cmd><stepxmp><codeblock>NetworkServerControl server = new NetworkServerControl();
+server.start (null);</codeblock></stepxmp></step>
 </steps>
 </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=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita Tue Jun 21 16:39:52 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -30,7 +29,7 @@
 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>
+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>
@@ -52,4 +51,3 @@
 </steps-unordered>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita Tue Jun 21 16:39:52 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <!-- 
@@ -31,8 +30,8 @@
 (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>&lt;java org.apache.derby.drda.NetworkServerControl ping [-h &lt;<i>hostname</i>&gt;] [-p &lt;<i>portnumber</i>&gt;] </codeblock
-></stepxmp></step>
+<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>
@@ -56,4 +55,3 @@
 	}</codeblock></example>
 </taskbody>
 </task>
-

Modified: incubator/derby/docs/trunk/src/adminguide/tadmincrtdbbkup.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadmincrtdbbkup.dita?rev=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadmincrtdbbkup.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadmincrtdbbkup.dita Tue Jun 21 16:39:52 2005
@@ -36,7 +36,7 @@
 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>
+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=191746&r1=191745&r2=191746&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminhubbkup44.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminhubbkup44.dita Tue Jun 21 16:39:52 2005
@@ -30,7 +30,7 @@
 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;createFrom=c:\mybackups\sample</codeblock></example>
+should be: <codeblock>jdbc:derby:toursDB;restoreFrom=c:\mybackups\sample</codeblock></example>
 </taskbody>
 </task>
 



Mime
View raw message