Return-Path:
X-Original-To: apmail-db-derby-commits-archive@www.apache.org
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
by minotaur.apache.org (Postfix) with SMTP id 69E1C108C8
for ;
Mon, 11 Nov 2013 15:41:14 +0000 (UTC)
Received: (qmail 40554 invoked by uid 500); 11 Nov 2013 15:41:14 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 40513 invoked by uid 500); 11 Nov 2013 15:41:14 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help:
list-unsubscribe:
List-Post:
Reply-To: "Derby Development"
List-Id:
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 40504 invoked by uid 99); 11 Nov 2013 15:41:13 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Nov 2013 15:41:13 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Nov 2013 15:41:07 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
by eris.apache.org (Postfix) with ESMTP id 9AA8B2388A3D;
Mon, 11 Nov 2013 15:40:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1540754 [2/2] - /db/derby/docs/trunk/src/adminguide/
Date: Mon, 11 Nov 2013 15:40:43 -0000
To: derby-commits@db.apache.org
From: chaase3@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131111154045.9AA8B2388A3D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
Modified: db/derby/docs/trunk/src/adminguide/radminjmxenablepwd.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxenablepwd.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxenablepwd.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxenablepwd.dita Mon Nov 11 15:40:42 2013
@@ -19,6 +19,8 @@ limitations under the License.
-->
Enabling remote JMX with password authentication only
+Some JVMs include built-in support for JMX password
+authentication.
Java Management Extensions (JMX) technology
JMXenabling with password authentication
@@ -26,11 +28,10 @@ limitations under the License.
-Some JVMs include built-in support for JMX password authentication. For
-example, with Oracle Java Development Kit (JDK) 6 or later, 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.
+For example, with Oracle Java Development Kit (JDK) 6 or later,
+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.
When authentication is enabled and a Java Security Manager is
installed, additional permissions may need to be granted to users in the
security policy used. See
Modified: db/derby/docs/trunk/src/adminguide/radminjmxenablepwdssl.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxenablepwdssl.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxenablepwdssl.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxenablepwdssl.dita Mon Nov 11 15:40:42 2013
@@ -19,6 +19,8 @@ limitations under the License.
-->
Enabling remote JMX with password authentication and SSL
+This example shows how to start the Network Server as
+follows.
Java Management Extensions (JMX) technology
JMXenabling with password authentication and SSL
@@ -26,7 +28,6 @@ limitations under the License.
-This example shows how to start the Network Server as follows:
- Using Oracle JDK 6 or later
- Using a Java security manager and a custom policy file,
Modified: db/derby/docs/trunk/src/adminguide/radminjmxenablesimpleauth.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxenablesimpleauth.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxenablesimpleauth.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxenablesimpleauth.dita Mon Nov 11 15:40:42 2013
@@ -19,6 +19,8 @@ limitations under the License.
-->
Simple authorization using an access file
+Some JVMs support a simple access file system for controlling JMX
+access.
Java Management Extensions (JMX) technology
JMXsimple authorization using an access file
@@ -26,8 +28,7 @@ limitations under the License.
-
Some JVMs support a simple access file system for controlling JMX access. An
-access file is formatted the same way as password files (described in
+
An access file is formatted the same way as password files (described in
), and associates
roles with an access level. Valid access levels are readonly
and readwrite:
Modified: db/derby/docs/trunk/src/adminguide/radminjmxintro.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxintro.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxintro.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxintro.dita Mon Nov 11 15:40:42 2013
@@ -20,6 +20,8 @@ limitations under the License.
Introduction to the
MBeans
+ provides the
+MBeans described in this section.
Java Management Extensions (JMX) technology
JMXusing
@@ -28,8 +30,6 @@ limitations under the License.
- provides the
-MBeans described in this section.
The public API documentation for each
MBean describes its
features in detail.
Modified: db/derby/docs/trunk/src/adminguide/radminjmxjconsole.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxjconsole.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxjconsole.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxjconsole.dita Mon Nov 11 15:40:42 2013
@@ -20,6 +20,9 @@ limitations under the License.
Using JConsole to access the
MBeans
+JConsole is a graphical JMX-compliant tool that is available in
+recent versions of the Oracle JDKs. JConsole enables you to monitor and manage
+Java applications and virtual machines on a local or remote machine.
Java Management Extensions (JMX) technology
JMXusing JConsole
@@ -27,9 +30,6 @@ limitations under the License.
-JConsole is a graphical JMX-compliant tool that is available in recent
-versions of the Oracle JDKs. JConsole enables you to monitor and manage Java
-applications and virtual machines on a local or remote machine.
You may use JConsole from JDK 6 or later even if you are running
using an earlier
version of the JDK (or just the JRE). (You could also use JConsole from JDK 5 if
@@ -40,7 +40,8 @@ More information about JConsole is avail
href="http://openjdk.java.net/tools/svc/jconsole/index.html"
scope="external">http://openjdk.java.net/tools/svc/jconsole/index.html.
-Starting JConsole and connecting to Derby
+Starting JConsole and connecting to
+
In the Oracle JDK, the JConsole binary is available in
JDK_HOME/bin, where JDK_HOME is the directory in which the JDK
is installed. To start JConsole, use the jconsole command, as
@@ -64,11 +65,13 @@ running JVM running on the
+local host, make sure you are running JConsole as the same user as the
+ 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.
Accessing MBeans
Once you have connected to a JVM via JConsole, the JVM's MBeans should be
Modified: db/derby/docs/trunk/src/adminguide/radminjmxtroubleshoot.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxtroubleshoot.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxtroubleshoot.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxtroubleshoot.dita Mon Nov 11 15:40:42 2013
@@ -19,6 +19,8 @@ limitations under the License.
-->
Troubleshooting JMX connection issues
+If you experience problems connecting remotely to an MBean server
+using JMX, it may be helpful to obtain some tracing information.
Java Management Extensions (JMX) technology
JMXusing a security policy
@@ -26,12 +28,12 @@ limitations under the License.
-If you experience problems connecting remotely to an MBean server using JMX
-(as described in
-and ), it may be helpful to
-obtain some tracing information. The JMX implementation in the Oracle JDK uses
-the java.util.logging API to log JMX traces. For example, in
-order to trace SSL connection issues, set the system property
+
For details on connecting remotely to an MBean server, see
+ and
+.
+The JMX implementation in the Oracle JDK uses the
+java.util.logging API to log JMX traces. For example, in order
+to trace SSL connection issues, set the system property
java.util.logging.config.file as shown in the following:
java -Djava.util.logging.config.file=logging.properties MyJmxClient
With JConsole, a separate logging window will appear if you specify the
Modified: db/derby/docs/trunk/src/adminguide/radminlicense.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminlicense.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminlicense.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminlicense.dita Mon Nov 11 15:40:42 2013
@@ -20,7 +20,6 @@ limitations under the License.
License
-
Apachelicense
Modified: db/derby/docs/trunk/src/adminguide/radminlog800241.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminlog800241.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminlog800241.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminlog800241.dita Mon Nov 11 15:40:42 2013
@@ -20,13 +20,15 @@ limitations under the License.
-->
Example of creating a log in a non-default location
+The following database connection URL creates a database in the
+directory d:/mydatabases, but puts the database log directory
+in h:/janets/tourslog.
-The following database connection URL creates a database in the
-directory d:/mydatabases, but puts the database log directory
-in h:/janets/tourslog:
- jdbc:derby:d:/mydatabases/toursDB;
- create=true;logDevice=h:/janets/tourslog
+
+jdbc:derby:d:/mydatabases/toursDB;
+ create=true;logDevice=h:/janets/tourslog
+
Modified: db/derby/docs/trunk/src/adminguide/radminlog800279.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminlog800279.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminlog800279.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminlog800279.dita Mon Nov 11 15:40:42 2013
@@ -18,21 +18,29 @@ limitations under the License.
Example of moving a log manually
-
-
+If you want to move the log to g:/bigdisk/tourslog,
+move the log with operating system commands.
+
-If you want to move the log to g:/bigdisk/tourslog, move the log with operating system commands:
+For example, you could use the following command:
+
move h:\janets\tourslog\log\*.* g:\bigdisk\tourslog\log
-Then, alter the logDevice entry in service.properties to read as follows:
-logDevice=g:/bigdisk/toursLog
+Then, alter the logDevice entry in
+service.properties to read as follows:
+
+logDevice=g:/bigdisk/toursLog
+
You can use either a single forward slash or double back slashes
for a path separator.
-If you later want to move the log back to its default location (in this
-case, d:\mydatabases\toursDB\log), move
-the log manually as follows:
+If you later want to move the log back to its default location (in
+this case, d:\mydatabases\toursDB\log), move the log manually
+as follows:
+
move g:\bigdisk\tourslog\log\*.* d:\mydatabases\toursDB\log
-Then, delete the logDevice entry from service.properties.
-This example uses commands that are specific to the Windows NT operating
+Then, delete the logDevice entry from
+service.properties.
+
+This example uses commands that are specific to the Windows operating
system. Use commands appropriate to your operating system to copy a directory
and all of its contents to a new location.
Modified: db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita Mon Nov 11 15:40:42 2013
@@ -20,10 +20,17 @@ limitations under the License.
-->
DataSource access examples
+These examples use
+org.apache.derby.jdbc.ClientDataSource and
+org.apache.derby.jdbc.ClientConnectionPoolDataSource to access
+the Network Server.
-The following example uses org.apache.derby.jdbc.ClientDataSource to
-access the Network Server:
+
+The following example uses
+org.apache.derby.jdbc.ClientDataSource to access the Network
+Server:
+
org.apache.derby.jdbc.ClientDataSource ds =
new org.apache.derby.jdbc.ClientDataSource();
ds.setDatabaseName("mydb");
Modified: db/derby/docs/trunk/src/adminguide/radminovnssample.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminovnssample.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminovnssample.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminovnssample.dita Mon Nov 11 15:40:42 2013
@@ -19,39 +19,46 @@ limitations under the License.
-->
The NsSample sample program
-The NsSample demonstration program is a simple JDBC application
-that interacts with the Network Server.
+The NsSample demonstration program is a simple JDBC
+application that interacts with the Network Server.
Network ServerNsSample sample program
-The NsSample program performs the following tasks:
- Connects to the database.
- Loads the schema by inserting data.
-- Starts client threads to perform database related operations.
+- Starts client threads to perform database related operations.
- Has each of the clients perform DML operations (select, insert, delete,
update) using JDBC calls. For example, one client thread establishes an embedded
-connection to perform database operations, while another client thread establishes
-a client connection to the Network Server to perform database operations.
-- Waits for the client threads to finish the tasks.
+connection to perform database operations, while another client thread
+establishes a client connection to the Network Server to perform database
+operations.
+- Waits for the client threads to finish the tasks.
- Shuts down the Network Server at the end of the demonstration.
-
You must install the following files in the %%\demo\nserverdemo\ directory before you can run the sample program:
-- NsSample.java
This is the entry point into the
-sample program. The program starts up two client threads. The first client
-establishes an embedded connection to perform database operations, and the
-second client establishes a client connection to the Network Server to perform
-database operations.
You can change the following constants to modify
-the sample program:
+
+You must install the following files in the
+%%\demo\nserverdemo\
+directory before you can run the sample program:
+
+- NsSample.java
+
This is the entry point into the sample program. The program starts up two
+client threads. The first client establishes an embedded connection to perform
+database operations, and the second client establishes a client connection to
+the Network Server to perform database operations.
+You can change the following constants to modify the sample program:
+
- NUM_ROWS
- The number of rows that must be initially loaded into the schema.
@@ -65,21 +72,26 @@ work.
- NETWORKSERVER_PORT
- The port on which the Network Server is running.
-- NsSampleClientThread.java
This file contains two
-Java classes:
The compiled class files for the NsSample program are:The compiled class files for the NsSample program are:
+
+- NsSample.class
+- NsSampleClientThread.class
+- NsSampleWork.class
+- NetworkServerUtil.class
Modified: db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita Mon Nov 11 15:40:42 2013
@@ -17,7 +17,10 @@ limitations under the License.
-->
-Derby Network Server sample programs
+ Network Server
+sample programs
+ provides
+several sample programs for Network Server users.
Sample programs for Network Server
@@ -25,6 +28,4 @@ limitations under the License.
-This section describes several Network Server sample
-programs for Network Server users.
Modified: db/derby/docs/trunk/src/adminguide/radminservlet810694.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminservlet810694.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminservlet810694.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminservlet810694.dita Mon Nov 11 15:40:42 2013
@@ -26,9 +26,11 @@ limitations under the License.
In addition to starting the Network Server, you can use the startup
-page to perform the following actions:
-- Turn logging on when the server is started.
-- Turn tracing on for all sessions when the server is started.
-
+page to perform the following actions:
+
+- Turn logging on when the server is started.
+- Turn tracing on for all sessions when the server is started.
+
+
Modified: db/derby/docs/trunk/src/adminguide/radminservlet810717.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminservlet810717.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminservlet810717.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminservlet810717.dita Mon Nov 11 15:40:42 2013
@@ -18,6 +18,9 @@ limitations under the License.
Running page
+If the Network Server is running (whether it was started by
+initializing the servlet or in some other manner), the running page is
+displayed.
Shutting down Network Serverusing servlet
@@ -26,22 +29,19 @@ interface
-If the Network Server is running (whether it was started by initializing
-the servlet or in some other manner), the running page is displayed. The running
-page indicates whether logging is on or off, whether tracing is on or off,
-and if tracing is on, indicates for which session.
-You can use the running page to stop the server and turn logging and tracing
-on or off. The following options are available
-from the running page:
+The running page indicates whether logging is on or off, whether
+tracing is on or off, and if tracing is on, indicates for which session.
+You can use the running page to stop the server and turn logging and tracing
+on or off. The following options are available from the running page:
-- Start or stop logging.
-- Start or stop tracing all sessions.
+- Start or stop logging.
+- Start or stop tracing all sessions.
- Specify session to trace. (If you choose this option, the Trace session
page is displayed.)
-- Change tracing directory (If you choose this option, the Trace directory
+
- Change tracing directory. (If you choose this option, the Trace directory
page is displayed.)
-- Specify threading parameters for Network Server. (If you choose this option,
-the Thread parameters page is displayed.)
+- Specify threading parameters for the Network Server. (If you choose this
+option, the Thread parameters page is displayed.)
- Stop the Network Server.
Modified: db/derby/docs/trunk/src/adminguide/radminservlet810796.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminservlet810796.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminservlet810796.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminservlet810796.dita Mon Nov 11 15:40:42 2013
@@ -18,12 +18,11 @@ limitations under the License.
Trace session page
-
-
+If on the running page you choose to specify a session to trace, this
+page is displayed. You must enter the Session ID.
+
-If on the running page you choose to specify a session to trace, this page
-is displayed. You must enter the Session ID.
You are given the option to turn tracing on or off or return to the previous
-menu. When you push the Trace On/Off button, information indicating the current
+menu. When you click the Trace On/Off button, information indicating the current
tracing state is displayed.
Modified: db/derby/docs/trunk/src/adminguide/radminservlet810822.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminservlet810822.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminservlet810822.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminservlet810822.dita Mon Nov 11 15:40:42 2013
@@ -18,12 +18,11 @@ limitations under the License.
Trace directory page
-
-
+This page is displayed if the you choose to change the tracing
+directory on the Running page. You must enter the Trace Directory.
+
-This page is displayed if the you choose to change the tracing directory
-on the Running page. You must enter the Trace Directory.
-You can either set a tracing directory, or you can return to the previous
-menu. Additional information is displayed that indicates the current tracing
-directory when you push the Set Directory button.
+You can either set a tracing directory, or you can return to the
+previous menu. Additional information is displayed that indicates the current
+tracing directory when you click the Set Directory button.
Modified: db/derby/docs/trunk/src/adminguide/radminservlet810910.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminservlet810910.dita?rev=1540754&r1=1540753&r2=1540754&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminservlet810910.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminservlet810910.dita Mon Nov 11 15:40:42 2013
@@ -18,17 +18,19 @@ See the License for the specific languag
limitations under the License.
-->
-Set Network Server parameters
+Set Network Server parameters
+The first page is displayed if the thread parameter button is
+clicked. Use this page to set the new parameters.
-The first page is displayed if the thread parameter button is
-pressed. Use this page to set the new parameters. Enter the following information:
-
+If either the maximum threads or time slice parameter is left blank, that
+value is left unchanged from the current setting.
+Click Set Network Server parameters to display the updated values for the
+maximum threads and the time slice parameters.