db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1567970 - /db/derby/docs/trunk/src/adminguide/
Date Thu, 13 Feb 2014 16:22:46 GMT
Author: chaase3
Date: Thu Feb 13 16:22:46 2014
New Revision: 1567970

URL: http://svn.apache.org/r1567970
Log:
DERBY-6236  Remove references to old JVMs (pre-Java 6) from the user guides

Modified 19 Admin Guide topics as well as the docs.properties file (copyright
year, release id, minimum JDK).

Patch: DERBY-6236-adminguide.diff

Modified:
    db/derby/docs/trunk/src/adminguide/cadminappsclient.dita
    db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
    db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
    db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
    db/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita
    db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
    db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita
    db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita
    db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita
    db/derby/docs/trunk/src/adminguide/radminjmxcode.dita
    db/derby/docs/trunk/src/adminguide/radminjmxenabledisable.dita
    db/derby/docs/trunk/src/adminguide/radminjmxenablenoauth.dita
    db/derby/docs/trunk/src/adminguide/radminjmxenablepwd.dita
    db/derby/docs/trunk/src/adminguide/radminjmxenablepwdssl.dita
    db/derby/docs/trunk/src/adminguide/radminjmxjconsole.dita
    db/derby/docs/trunk/src/adminguide/radminovnssample.dita
    db/derby/docs/trunk/src/adminguide/tadminovclirun.dita
    db/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita
    db/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita

Modified: db/derby/docs/trunk/src/adminguide/cadminappsclient.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclient.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclient.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclient.dita Thu Feb 13 16:22:46 2014
@@ -20,7 +20,7 @@ limitations under the License.
 <concept id="cadminappsclient" xml:lang="en-us">
 <title>Accessing the Network Server by using the network client driver</title>
 <shortdesc>When connecting to the Network Server, your application needs to
-load a driver and connection URL that is specific to the Network Server. In
+load a driver and connection URL that are specific to the Network Server. In
 addition, you must specify a user name and password if you are using
 authentication.</shortdesc>
 <prolog><metadata>
@@ -35,6 +35,8 @@ authentication.</shortdesc>
 where the <codeph><i>URL-attribute</i></codeph> is either a <ph
 conref="../conrefs.dita#prod/productshortname"></ph> embedded or network
 client attribute.</p>
+<p>When you access the Network Server using a connection URL, the network
+client driver is loaded automatically.</p> 
 <p>To access an in-memory database using the Network Server, the syntax is:</p>
 <codeblock>jdbc:derby://<i>server</i>[:<i>port</i>]/memory:
 <i>databaseName</i>[;<i>URL-attribute</i>=<i>value</i>
[;...]]</codeblock>

Modified: db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita Thu Feb 13 16:22:46 2014
@@ -84,15 +84,11 @@ the Diffie-Hellman algorithm with a publ
 </tbody>
 </tgroup>
 </table>
-<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides three
-ClientDataSource implementations. You can use the
-<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> class on
-Java SE 5 and above (except Java SE 8 Compact Profiles), in applications that
-call JDBC 3 or JDBC 4.0 methods. You can use the
-<codeph>org.apache.derby.jdbc.ClientDataSource40</codeph> class on
-Java SE 6 and above (except Java SE 8 Compact Profiles), in applications that
-call JDBC 4.1 or JDBC 4.2 methods. You must use the
-<codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph> class on
-Java SE 8 Compact Profile 2 or 3.</p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides two
+ClientDataSource implementations. Use the
+<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> class on all supported
+Java SE versions except Java SE 8 Compact Profiles. On Java SE 8 Compact
+Profile 2 or 3, use the
+<codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph> class.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita Thu Feb 13 16:22:46 2014
@@ -52,16 +52,12 @@ non-null value.</li>
 <codeph>ClientDataSource</codeph> to trace each connection flow in its own file
 for programs that have multiple connections.</li>
 </ul></p>
-<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides three
-<codeph>ClientDataSource</codeph> implementations. You can use the
-<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> class on
-Java SE 5 and above (except Java SE 8 Compact Profiles), in applications that
-call JDBC 3 or JDBC 4.0 methods. You can use the
-<codeph>org.apache.derby.jdbc.ClientDataSource40</codeph> class on
-Java SE 6 and above (except Java SE 8 Compact Profiles), in applications that
-call JDBC 4.1 or JDBC 4.2 methods. You must use the
-<codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph>class on
-Java SE 8 Compact Profile 2 or 3.</p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides two
+ClientDataSource implementations. Use the
+<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> class on all supported
+Java SE versions except Java SE 8 Compact Profiles. On Java SE 8 Compact
+Profile 2 or 3, use the
+<codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph> class.</p>
 </section>
 <section><title>Implementing DriverManager tracing</title>
 <p>Use one of the following two options to enable and collect tracing

Modified: db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita Thu Feb 13 16:22:46 2014
@@ -27,19 +27,11 @@ client driver's XA DataSource interface.
 </metadata></prolog>
 <conbody>
 <section>
-<p>You can use the <codeph>org.apache.derby.jdbc.ClientXADataSource</codeph>
-class on Java SE 5 and above (except Java SE 8 Compact Profiles), in
-applications that call JDBC 3 or JDBC 4.0 methods. You can use the
-<codeph>org.apache.derby.jdbc.ClientXADataSource40</codeph> class on
-Java SE 6 and above (except Java SE 8 Compact Profiles), in applications that
-call JDBC 4.1 or JDBC 4.2 methods. You must use the
-<codeph>org.apache.derby.jdbc.BasicClientXADataSource40</codeph> class on
-Java SE 8 Compact Profile 2 or 3.</p>
-<p>
-If your client is running on the Java SE 6 platform or higher, all connection
-objects returned from the DataSource will be JDBC 4 connection objects, whether
-or not you are using a DataSource whose name ends in "40".
-</p></section>
+<p>Use the <codeph>org.apache.derby.jdbc.ClientXADataSource</codeph>
+class on all supported Java SE versions except Java SE 8 Compact Profiles. On
+Java SE 8 Compact Profile 2 or 3, use the
+<codeph>org.apache.derby.jdbc.BasicClientXADataSource40</codeph> class.</p>
+</section>
 <example><p>The following example illustrates how to obtain an XA connection
 with the network client driver:</p>
 <codeblock>import org.apache.derby.jdbc.ClientXADataSource;

Modified: db/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita Thu Feb 13 16:22:46 2014
@@ -23,12 +23,7 @@ for its own access.</shortdesc>
 <prolog>
 </prolog>
 <conbody>
-<codeblock>/*
-    If you are running on JDK 6 or higher, you do not
-    need to invoke Class.forName(). In that environment, the
-    EmbeddedDriver loads automatically.
-*/
-Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
+<codeblock>
 Connection conn = DriverManager.getConnection(
     "jdbc:derby:sample");
 </codeblock>

Modified: db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita Thu Feb 13 16:22:46 2014
@@ -27,23 +27,13 @@ Client driver <codeph>DataSource</codeph
 <indexterm>Network Server<indexterm>using DataSource objects</indexterm></indexterm>
 </keywords></metadata></prolog>
 <conbody>
-<p>You can use the <codeph>org.apache.derby.jdbc.ClientDataSource</codeph>
and
+<p>Use the <codeph>org.apache.derby.jdbc.ClientDataSource</codeph> and
 <codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph> classes
-on Java SE 5 and above (except Java SE 8 Compact Profiles), in applications that
-call JDBC 3 or JDBC 4.0 methods. You can use the
-<codeph>org.apache.derby.jdbc.ClientDataSource40</codeph> and
-<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</codeph> classes
-on Java SE 6 and above (except Java SE 8 Compact Profiles), in applications that
-call JDBC 4.1 or JDBC 4.2 methods. You must use the
+on all supported Java SE versions (except Java SE 8 Compact Profiles). On
+Java SE 8 Compact Profile 2 or 3, use the
 <codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph> and
 <codeph>org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40</codeph>
-classes on Java SE 8 Compact Profile 2 or 3.</p>
-<p>
-If your client is running on the Java SE 6 platform or higher, all connection
-objects returned from the <codeph>DataSource</codeph> will be JDBC 4 connection
-objects, whether or not you are using a <codeph>DataSource</codeph> whose name
-ends in "40".
-</p>
+classes.</p>
 <section><title>Using statement caching</title>
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph> supports JDBC
 statement caching, which can improve the performance of applications that use
@@ -52,8 +42,7 @@ objects. Statement caching avoids the pe
 the network from the client to the server to prepare a statement that has
 already been prepared on the same connection.</p>
 <p>To use statement caching, you must use an
-<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph>,
-<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</codeph>, or
+<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph> or
 <codeph>org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40</codeph>
 object. After you instantiate this object, perform these steps:</p>
 <ol>

Modified: db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita Thu Feb 13 16:22:46 2014
@@ -32,17 +32,14 @@ another JVM.</shortdesc>
 <conbody>
 <p>The program performs the following tasks:
 <ol>
-<li>Loads the network client driver. (Note that this step is not
-necessary if you are running the client on JDK 1.6 or higher. In that
-environment, the network client driver loads automatically.)</li>
 <li>Obtains a client connection by using the <codeph>DriverManager</codeph>.</li>
 <li>Obtains a client connection by using a DataSource.</li>
 <li>Tests the database connections by running a sample query.</li>
 <li>Closes the connections and then exits the program.</li>
 </ol></p>
-<p>You must install the following files in the
+<p>To run the sample program, use the following files in the
 <codeph>%<ph conref="../conrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph>
-directory before you can run the sample program:
+directory:
 <ul>
 <li>The source file: <codeph>SimpleNetworkClientSample.java</codeph></li>
 <li>The compiled class file: <codeph>SimpleNetworkClientSample.class</codeph></li>

Modified: db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita Thu Feb 13 16:22:46 2014
@@ -42,7 +42,7 @@ stop the server and exit the program</li
 <li>Closes the connection</li>
 <li>Shuts down the Network Server before exiting the program</li>
 </ol></p>
-<p> To run the sample program, install the following files in the
+<p> To run the sample program, you need the following files in the
 <codeph>%<ph conref="../conrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph>
 directory:
 <ul>

Modified: db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita Thu Feb 13 16:22:46 2014
@@ -49,12 +49,6 @@ java.util.Properties props = new java.ut
 props.setProperty("user","usr");
 props.setProperty("password","pwd");
 
-/*
-    If you are running on JDK 6 or higher, you do not
-    need to invoke Class.forName(). In that environment, the
-    ClientDriver loads automatically.
-*/
-Class.forName("org.apache.derby.jdbc.ClientDriver");
 Connection conn = DriverManager.getConnection(nsURL, props);
 
 /*interact with <ph conref="../conrefs.dita#prod/productshortname"></ph>*/

Modified: db/derby/docs/trunk/src/adminguide/radminjmxcode.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxcode.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxcode.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxcode.dita Thu Feb 13 16:22:46 2014
@@ -74,7 +74,7 @@ password authentication is enabled (the 
     // Set credentials (jmx.remote.credentials, 
     //  see JMX Remote API 1.0 spec section 3.4)
     env.put(JMXConnector.CREDENTIALS, credentials);
-    // if the server's RMI registry is protected with SSL/TLS (JDK 6)
+    // if the server's RMI registry is protected with SSL/TLS
     //  (com.sun.management.jmxremote.registry.ssl=true), the following
     //  entry must be included:
     //env.put("com.sun.jndi.rmi.factory.socket", 

Modified: db/derby/docs/trunk/src/adminguide/radminjmxenabledisable.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxenabledisable.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxenabledisable.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxenabledisable.dita Thu Feb 13 16:22:46 2014
@@ -37,13 +37,9 @@ users to access the JVM, or to allow acc
 enabled.</p>
 </section>
 <section><title>Local JMX access</title>
-<p>If you are using a Java SE 6 or later JVM, local JMX management and
-monitoring are most likely enabled by default.</p>
-<p>Some JVMs, for example Java SE 5 JVMs, do not enable local JMX management by
-default. Refer to the documentation for your JVM for details. A common way to
-enable local JMX access on these JVMs is to include the
-<codeph>-Dcom.sun.management.jmxremote</codeph> option on the command line when
-you start the JVM.</p>
+<p>Local JMX management and monitoring are enabled by default on platforms that
+support JMX. (Java SE 8 Compact Profile 2, for example, does not support
+JMX.)</p>
 </section>
 <section><title>Remote JMX access</title>
 <p>Remote JMX management and monitoring is a powerful Java feature, allowing you

Modified: db/derby/docs/trunk/src/adminguide/radminjmxenablenoauth.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxenablenoauth.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxenablenoauth.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxenablenoauth.dita Thu Feb 13 16:22:46 2014
@@ -22,7 +22,7 @@ limitations under the License.
 <shortdesc>The following simple example starts the
 <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server on the
 command line with <i>insecure</i> remote JMX management and monitoring enabled,
-using an Oracle JDK 6 or later JVM.</shortdesc>
+using an Oracle JDK JVM.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Java Management Extensions (JMX) technology</indexterm>
 <indexterm>JMX<indexterm>enabling without authentication</indexterm></indexterm>

Modified: db/derby/docs/trunk/src/adminguide/radminjmxenablepwd.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxenablepwd.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxenablepwd.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxenablepwd.dita Thu Feb 13 16:22:46 2014
@@ -28,7 +28,7 @@ authentication.</shortdesc>
 </metadata></prolog>
 <refbody>
 <section>
-<p>For example, with Oracle Java Development Kit (JDK) 6 or later,
+<p>For example, with the Oracle Java Development Kit (JDK),
 authentication is enabled by default, and it is possible to specify a properties
 file that contains usernames and passwords. The properties file syntax is the
 same as for other Java properties files.</p>

Modified: db/derby/docs/trunk/src/adminguide/radminjmxenablepwdssl.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxenablepwdssl.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxenablepwdssl.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxenablepwdssl.dita Thu Feb 13 16:22:46 2014
@@ -29,7 +29,6 @@ follows.</shortdesc>
 <refbody>
 <section>
 <ul>
-<li>Using Oracle JDK 6 or later</li>
 <li>Using a Java security manager and a custom policy file,
 <codeph>jmx.policy</codeph></li>
 <li>Allowing connections from remote hosts (that is, on all IPv4 network
@@ -90,17 +89,11 @@ as well as the truststore properties, ma
 authenticate clients using SSL. However, there may be security risks associated
 with using password authentication only.</p>
 <p>The system property
-<codeph>com.sun.management.jmxremote.registry.ssl=true</codeph> was new in
-JDK 6 and aims at resolving security issues with the RMI registry used in
+<codeph>com.sun.management.jmxremote.registry.ssl=true</codeph> aims at
+resolving security issues with the RMI registry used in
 relation with JMX. This property must be used in conjunction with
 <codeph>com.sun.management.jmxremote.ssl.need.client.auth=true</codeph> in order
 to fully secure the RMI registry.</p>
-<p>If you use a Java SE 5 JDK, clients must provide an additional entry in the
-environment map passed to the <codeph>JMXConnector</codeph> when enabling SSL
-protection of the registry:</p>
-<codeblock>env.put("com.sun.jndi.rmi.factory.socket", new SslRMIClientSocketFactory());</codeblock>
-<p>See <xref href="radminjmxcode.dita#radminjmxcode/connmbeanserver"></xref>
for
-details.</p>
 <p>Clients must also specify and use proper keystores and/or truststores (the
 truststores must contain the server's SSL certificate).</p>
 <p>For more information about the system properties used above and potential

Modified: db/derby/docs/trunk/src/adminguide/radminjmxjconsole.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxjconsole.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxjconsole.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxjconsole.dita Thu Feb 13 16:22:46 2014
@@ -30,12 +30,7 @@ Java applications and virtual machines o
 </metadata></prolog>
 <refbody>
 <section>
-<p>You may use JConsole from JDK 6 or later even if you are running
-<ph conref="../conrefs.dita#prod/productshortname"></ph> using an earlier
-version of the JDK (or just the JRE). (You could also use JConsole from JDK 5 if
-you are running <ph conref="../conrefs.dita#prod/productshortname"></ph> using
-JDK 6 or later.) It is recommended that you use the newest version possible.
-More information about JConsole is available in the OpenJDK project at
+<p>More information about JConsole is available in the OpenJDK project at
 <xref format="html"
 href="http://openjdk.java.net/tools/svc/jconsole/index.html"
 scope="external">http://openjdk.java.net/tools/svc/jconsole/index.html</xref>.</p>
@@ -69,9 +64,7 @@ and port number, or a JMX service URL, i
 <ph conref="../conrefs.dita#prod/productshortname"></ph> JVM running on the
 local host, make sure you are running JConsole as the same user as the
 <ph conref="../conrefs.dita#prod/productshortname"></ph> JVM, or as a different
-user with sufficient file system permissions. If you are using Java SE 5, make
-sure you have enabled JMX. When you use Java SE 6 or later, local JMX access is
-enabled by default.</p>
+user with sufficient file system permissions.</p>
 </section>
 <section><title>Accessing MBeans</title>
 <p>Once you have connected to a JVM via JConsole, the JVM's MBeans should be

Modified: db/derby/docs/trunk/src/adminguide/radminovnssample.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminovnssample.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminovnssample.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminovnssample.dita Thu Feb 13 16:22:46 2014
@@ -30,9 +30,6 @@ application that interacts with the Netw
 <ul>
 <li>Starts the Network Server.</li>
 <li>Checks that the Network Server is running.</li>
-<li>Loads the Network Client driver. (Note that this step is not
-necessary if you are running the client on JDK 1.6 or higher. In that
-environment, the network client driver loads automatically.)</li>
 <li>Creates the <codeph>NsSampledb</codeph> database if it has not already
been
 created.</li>
 <li>Checks to see if the schema is already created, and if not, creates the

Modified: db/derby/docs/trunk/src/adminguide/tadminovclirun.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadminovclirun.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadminovclirun.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadminovclirun.dita Thu Feb 13 16:22:46 2014
@@ -37,7 +37,7 @@ is the directory where you installed
 <li><codeph>derbyclient.jar</codeph></li>
 </ul></info></step>
 <step><cmd>After you set up your environment correctly, run the
-<codeph>SimpleNetworkServerSample</codeph> program from the same
+<codeph>SimpleNetworkClientSample</codeph> program from the same
 directory:</cmd>
 <stepxmp>
 <codeblock><b>java SimpleNetworkClientSample</b></codeblock>
@@ -46,13 +46,16 @@ directory:</cmd>
 to that shown in the following example:
 <codeblock>Starting Sample client program
 Got a client connection via the DriverManager.
-connection from datasource; 
+connection from datasource; getDriverName = Apache Derby Network Client JDBC Driver
 Got a client connection via a DataSource.
 Testing the connection obtained via DriverManager by executing a sample query
-number of rows in sys.systables = 16
+number of rows in sys.systables = 23
 Testing the connection obtained via a DataSource by executing a sample query
-number of rows in sys.systables = 16
+number of rows in sys.systables = 23
 Goodbye!</codeblock></stepresult></step>
+<step><cmd>After running the program, return to the command prompt where you
ran
+the <codeph>SimpleNetworkServerSample</codeph> program and press Enter.</cmd>
+</step>
 </steps>
 </taskbody>
 </task>

Modified: db/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita Thu Feb 13 16:22:46 2014
@@ -45,10 +45,6 @@ driver.</dd>
 <dt><codeph>derby.jar</codeph></dt>
 <dd>The <ph conref="../conrefs.dita#prod/productshortname"></ph> database
 engine jar file.</dd>
-</dlentry><dlentry>
-<dt><codeph>derbytools.jar</codeph></dt>
-<dd>The <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
jar
-file.</dd>
 </dlentry></dl></info></step>
 <step><cmd>Test the CLASSPATH settings by running the following Java
 command:</cmd>
@@ -66,48 +62,48 @@ the classpath as well as their respectiv
 </stepxmp>
 <stepresult>If the program runs successfully, you will receive output similar
 to the following:
-<codeblock><ph conref="../conrefs.dita#prod/productshortname"></ph> Network
Server created
-Server is ready to accept connections on port 1621.
-Connection number: 1.
+<codeblock>Using JDBC driver: org.apache.derby.jdbc.ClientDriver
+Derby Network Server created
+Apache <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server
started
+and ready to accept connections on port 1621
 [NsSample] <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server
started.
 [NsSample] Sample <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
Server program demo starting.
 Please wait .....................
 Connection number: 2.
 [NsSampleWork] Begin creating table - SAMPLETBL and necessary indexes.
+[NsSampleClientThread] Thread id - 2; started.
+[NsSampleWork] Thread id - 2; requests database connection, 
+	dbUrl =jdbc:derby://localhost:1621/NSSampledb;create=true;
 [NsSampleClientThread] Thread id - 1; started.
 [NsSampleWork] Thread id - 1; requests database connection, 
 	dbUrl =jdbc:derby:NSSampledb;
-[NsSampleClientThread] Thread id - 2; started.
-[NsSampleWork] Thread id - 2; requests database connection, 
-	dbUrl =jdbc:derby://localhost:1621/
-	NSSampledb;deferPrepares=true;
-Connection number: 3.
-[NsSampleWork] Thread id - 1 selected 1 row [313,Derby36   ,1.7686243E23,9620]
-[NsSampleWork] Thread id - 1 selected 1 row [313,Derby36   ,1.7686243E23,9620]
-[NsSampleWork] Thread id - 1; deleted 1 row with t_key = 9620
-[NsSampleWork] Thread id - 1 selected 1 row [700,Derby34   ,8.7620301E9,9547]
-[NsSampleWork] Thread id - 1 selected 1 row [700,Derby34   ,8.7620301E9,9547]
-[NsSampleWork] Thread id - 2 selected 1 row [700,Derby34   ,8.7620301E9,9547]
-[NsSampleWork] Thread id - 2 selected 1 row [700,Derby34   ,8.7620301E9,9547]
 [NsSampleWork] Thread id - 1; inserted 1 row.
-[NsSampleWork] Thread id - 1 selected 1 row [52,Derby34   ,8.7620301E9,9547]
-[NsSampleWork] Thread id - 2; updated 1 row with t_key = 9547
-[NsSampleWork] Thread id - 1; deleted 1 row with t_key = 9547
-[NsSampleWork] Thread id - 2 selected 1 row [617,Derby31   ,773.83636,9321]
-[NsSampleWork] Thread id - 2 selected 1 row [617,Derby31   ,773.83636,9321]
-[NsSampleWork] Thread id - 2 selected 1 row [617,Derby31   ,773.83636,9321]
-[NsSampleWork] Thread id - 2 selected 1 row [617,Derby31   ,773.83636,9321]
 [NsSampleWork] Thread id - 1; inserted 1 row.
-[NsSampleWork] Thread id - 2; deleted 1 row with t_key = 9321
-[NsSampleWork] Thread id - 1; deleted 1 row with t_key = 8707
+[NsSampleWork] Thread id - 1; deleted 1 row with t_key = 9372
+[NsSampleWork] Thread id - 1 selected 1 row [920,Derby50        ,951.7808,9216]
+[NsSampleWork] Thread id - 1 selected 1 row [920,Derby50        ,951.7808,9216]
+[NsSampleWork] Thread id - 1; inserted 1 row.
+[NsSampleWork] Thread id - 1 selected 1 row [920,Derby50        ,951.7808,9216]
+[NsSampleWork] Thread id - 1; deleted 1 row with t_key = 9216
+[NsSampleWork] Thread id - 1 selected 1 row [824,Derby26        ,8.802546E22,9155]
+[NsSampleWork] Thread id - 1; updated 1 row with t_key = 9155
 [NsSampleWork] Thread id - 1; closed connection to the database.
 [NsSampleClientThread] Thread id - 1; finished all tasks.
-[NsSampleWork] Thread id - 2; deleted 1 row with t_key = 8490
+[NsSampleWork] Thread id - 2; updated 0 row with t_key = 9372
+[NsSampleWork] Thread id - 2; updated 1 row with t_key = 9155
+[NsSampleWork] Thread id - 2 selected 1 row [56,Derby26        ,8.802546E22,9155]
+[NsSampleWork] Thread id - 2; inserted 1 row.
+[NsSampleWork] Thread id - 2; updated 1 row with t_key = 9155
+[NsSampleWork] Thread id - 2; deleted 1 row with t_key = 9155
+[NsSampleWork] Thread id - 2 selected 1 row [785,Derby2         ,0.30170244,8280]
+[NsSampleWork] Thread id - 2 selected 1 row [785,Derby2         ,0.30170244,8280]
+[NsSampleWork] Thread id - 2; updated 1 row with t_key = 8280
+[NsSampleWork] Thread id - 2 selected 1 row [59,Derby2         ,0.30170244,8280]
 [NsSampleWork] Thread id - 2; closed connection to the database.
 [NsSampleClientThread] Thread id - 2; finished all tasks.
-[NsSample] Shutting down Network Server.
-Connection number: 4.
-Shutdown successful.
+[NsSample] Shutting down network server.
+Apache <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server
- shutdown
+[NsSample] End of Network server demo.
 </codeblock></stepresult></step>
 </steps>
 <result>Running the <codeph>NsSample</codeph> program also creates the
following

Modified: db/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita?rev=1567970&r1=1567969&r2=1567970&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita Thu Feb 13 16:22:46 2014
@@ -39,10 +39,6 @@ the Network Server in this program.</dd>
 </dlentry><dlentry>
 <dt><codeph>derby.jar</codeph></dt>
 <dd>The database engine jar file.</dd>
-</dlentry><dlentry>
-<dt><codeph>derbytools.jar</codeph></dt>
-<dd>The <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
jar
-file.</dd>
 </dlentry></dl></info></step>
 <step><cmd>Test the CLASSPATH settings by running the following Java
 command:</cmd>
@@ -75,7 +71,9 @@ While my app is busy with embedded work,
 Clients can continue to connect:
 Press [Enter] to stop Server</codeblock></stepresult></step>
 </steps>
-<result><p>Running the <codeph>SimpleNetworkServerSample</codeph>
program also
+<result><p>Do not press Enter at this time. Leave the server running while you
+run the <codeph>SimpleNetworkClientSample</codeph> program.</p>
+<p>Running the <codeph>SimpleNetworkServerSample</codeph> program also
 creates the following new directory and file:
 <dl><dlentry>
 <dt><codeph>NSSimpleDB</codeph></dt>



Mime
View raw message