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 37F9410918 for ; Mon, 11 Nov 2013 15:54:04 +0000 (UTC) Received: (qmail 68511 invoked by uid 500); 11 Nov 2013 15:54:03 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 68468 invoked by uid 500); 11 Nov 2013 15:54:03 -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 68457 invoked by uid 99); 11 Nov 2013 15:54:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Nov 2013 15:54:02 +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:53:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 015CC238896F; Mon, 11 Nov 2013 15:53:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1540756 [1/2] - /db/derby/docs/branches/10.10/src/adminguide/ Date: Mon, 11 Nov 2013 15:53:36 -0000 To: derby-commits@db.apache.org From: chaase3@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131111155338.015CC238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chaase3 Date: Mon Nov 11 15:53:35 2013 New Revision: 1540756 URL: http://svn.apache.org/r1540756 Log: DERBY-6379 Manuals are inconsistent in their use of the element Merged DERBY-6379-adminreference.diff to 10.10 doc branch from trunk revision 1540754. Modified: db/derby/docs/branches/10.10/src/adminguide/derbyadmin.ditamap db/derby/docs/branches/10.10/src/adminguide/radminappsclientxmp.dita db/derby/docs/branches/10.10/src/adminguide/radminappsresultsetdiffs.dita db/derby/docs/branches/10.10/src/adminguide/radminconfig.dita db/derby/docs/branches/10.10/src/adminguide/radminconfigdb2jdrdalogconnections.dita db/derby/docs/branches/10.10/src/adminguide/radminconfigdb2jdrdatracedirectory.dita db/derby/docs/branches/10.10/src/adminguide/radminconfigportnumber.dita db/derby/docs/branches/10.10/src/adminguide/radminconfigstartnetworkserver.dita db/derby/docs/branches/10.10/src/adminguide/radminconsist24642.dita db/derby/docs/branches/10.10/src/adminguide/radminconsist30301.dita db/derby/docs/branches/10.10/src/adminguide/radminconsist38781.dita db/derby/docs/branches/10.10/src/adminguide/radmindrdaStreamOutBufferSize.dita db/derby/docs/branches/10.10/src/adminguide/radmindrdahost.dita db/derby/docs/branches/10.10/src/adminguide/radmindrdakeepalive.dita db/derby/docs/branches/10.10/src/adminguide/radmindrdamaxthreads.dita db/derby/docs/branches/10.10/src/adminguide/radmindrdaminthreads.dita db/derby/docs/branches/10.10/src/adminguide/radmindrdasecmechanism.dita db/derby/docs/branches/10.10/src/adminguide/radmindrdasslmode.dita db/derby/docs/branches/10.10/src/adminguide/radmindrdatimeslice.dita db/derby/docs/branches/10.10/src/adminguide/radminembeddedserverex.dita db/derby/docs/branches/10.10/src/adminguide/radminexportarguments.dita db/derby/docs/branches/10.10/src/adminguide/radminimport64241.dita db/derby/docs/branches/10.10/src/adminguide/radminimport91458.dita db/derby/docs/branches/10.10/src/adminguide/radminimportcodeset.dita db/derby/docs/branches/10.10/src/adminguide/radminjmxcode.dita db/derby/docs/branches/10.10/src/adminguide/radminjmxdisable.dita db/derby/docs/branches/10.10/src/adminguide/radminjmxenabledisable.dita db/derby/docs/branches/10.10/src/adminguide/radminjmxenablenoauth.dita db/derby/docs/branches/10.10/src/adminguide/radminjmxenablepolicy.dita db/derby/docs/branches/10.10/src/adminguide/radminjmxenablepwd.dita db/derby/docs/branches/10.10/src/adminguide/radminjmxenablepwdssl.dita db/derby/docs/branches/10.10/src/adminguide/radminjmxenablesimpleauth.dita db/derby/docs/branches/10.10/src/adminguide/radminjmxintro.dita db/derby/docs/branches/10.10/src/adminguide/radminjmxjconsole.dita db/derby/docs/branches/10.10/src/adminguide/radminjmxtroubleshoot.dita db/derby/docs/branches/10.10/src/adminguide/radminlicense.dita db/derby/docs/branches/10.10/src/adminguide/radminlog800241.dita db/derby/docs/branches/10.10/src/adminguide/radminlog800279.dita db/derby/docs/branches/10.10/src/adminguide/radminnsdatasourcexmp.dita db/derby/docs/branches/10.10/src/adminguide/radminovnssample.dita db/derby/docs/branches/10.10/src/adminguide/radminsampleprograms.dita db/derby/docs/branches/10.10/src/adminguide/radminservlet810694.dita db/derby/docs/branches/10.10/src/adminguide/radminservlet810717.dita db/derby/docs/branches/10.10/src/adminguide/radminservlet810796.dita db/derby/docs/branches/10.10/src/adminguide/radminservlet810822.dita db/derby/docs/branches/10.10/src/adminguide/radminservlet810910.dita Modified: db/derby/docs/branches/10.10/src/adminguide/derbyadmin.ditamap URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/derbyadmin.ditamap?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/derbyadmin.ditamap (original) +++ db/derby/docs/branches/10.10/src/adminguide/derbyadmin.ditamap Mon Nov 11 15:53:35 2013 @@ -161,7 +161,7 @@ - + @@ -289,7 +289,7 @@ navtitle="Setting Network Server propert - + @@ -360,7 +360,7 @@ program"> - + Modified: db/derby/docs/branches/10.10/src/adminguide/radminappsclientxmp.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminappsclientxmp.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminappsclientxmp.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminappsclientxmp.dita Mon Nov 11 15:53:35 2013 @@ -19,17 +19,20 @@ limitations under the License. --> Network client driver examples +The following examples specify the user and password URL +attributes.
-

The following examples specify the user and password URL attributes. -To enable user authentication, you must either use NATIVE authentication or -explicitly set the property derby.connection.requireAuthentication -to true. Otherwise, -does not require a user name and password. For details on how to enable -user authentication, see "Working with user authentication" in the +

To enable user authentication, you must either use NATIVE authentication or +explicitly set the property +derby.connection.requireAuthentication to +true. Otherwise, + does not require a user +name and password. For details on how to enable user authentication, see +"Working with user authentication" in the .

For a multi-user product, you would typically specify authentication for the -system in the derby.properties file for your +system in the derby.properties file for your server, since it is in a trusted environment. The following property setting specifies NATIVE authentication:

derby.authentication.provider=NATIVE:myCredentialsDB:LOCAL @@ -38,17 +41,22 @@ rely on NATIVE authentication, an extern user-defined class for authentication. It is also strongly recommended that production systems protect network connections with SSL/TLS.

-
Example 1

The following example connects to the -default server name localhost on the default port, 1527, and to the database -sample.

-jdbc:derby://localhost:1527/sample;user=judy;password=no12see
-
Example 2

The following example specifies both and Network Client -driver attributes: jdbc:derby://localhost:1527/sample;create=true;user=judy; -password=no12see

-
Example 3

This example connects to the default server -name localhost on the default port, 1527, and includes the path in the database -name portion of the URL.

jdbc:derby://localhost:1527/c:/my-db-dir/my-db-name;user=judy; +
Example 1 +

The following example connects to the default server name localhost on the +default port, 1527, and to the database sample.

+jdbc:derby://localhost:1527/sample;user=judy;password=no12see +
+
Example 2 +

The following example specifies both + and Network Client +driver attributes:

+jdbc:derby://localhost:1527/sample;create=true;user=judy;password=no12see +
+
Example 3 +

This example connects to the default server name localhost +on the default port, 1527, and includes the path in the database name portion of +the URL.

+jdbc:derby://localhost:1527/c:/my-db-dir/my-db-name;user=judy; password=no12see

For a programming example that shows how to connect to the server using NATIVE authentication, see "NATIVE authentication and SQL authorization example" Modified: db/derby/docs/branches/10.10/src/adminguide/radminappsresultsetdiffs.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminappsresultsetdiffs.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminappsresultsetdiffs.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminappsresultsetdiffs.dita Mon Nov 11 15:53:35 2013 @@ -19,11 +19,11 @@ limitations under the License. --> Updatable result sets - -

In , the +In , the functionality of updatable result sets in a server environment and in an embedded environment are similar, with the exception of the following -differences:

+differences. +
  • The embedded driver allows for statement name changes when there is an open result set on the statement object. This is not supported in a server Modified: db/derby/docs/branches/10.10/src/adminguide/radminconfig.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminconfig.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminconfig.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminconfig.dita Mon Nov 11 15:53:35 2013 @@ -20,16 +20,23 @@ limitations under the License. --> derby.drda.traceAll property +Turns tracing on for all sessions. derby.drda.traceAll property -
    Turns tracing on for all sessions.
    -Syntax derby.drda.traceAll=[true|false] -
    Default

    False.

    - Examplederby.drda.traceAll=true -
    Static or dynamic

    Dynamic. You can change system -values by using commands after the Network Server has been started.

    +Syntax +derby.drda.traceAll={true|false} + +
    Default +

    False.

    +
    +Example +derby.drda.traceAll=true + +
    Static or dynamic +

    Dynamic. You can change system values by using commands after the Network +Server has been started.

    Modified: db/derby/docs/branches/10.10/src/adminguide/radminconfigdb2jdrdalogconnections.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminconfigdb2jdrdalogconnections.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminconfigdb2jdrdalogconnections.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminconfigdb2jdrdalogconnections.dita Mon Nov 11 15:53:35 2013 @@ -19,18 +19,28 @@ limitations under the License. --> derby.drda.logConnections property +Indicates whether to log connections. derby.drda.logConnections property -
    Indicates whether to log connections. Also controls the logging of -the connection number. Connection number tracing, if enabled, goes to both -the derby.log file and the network server console.
    -Syntax derby.drda.logConnections=[true|false] -
    Default

    False.

    - Examplederby.drda.logConnections=true -
    Static or dynamic

    Dynamic. You can change system -values by using commands after the Network Server has been started.

    +
    +

    This property also controls the logging of the connection number. Connection +number tracing, if enabled, goes to both the derby.log file and +the Network Server console.

    +
    +Syntax +derby.drda.logConnections={true|false} + +
    Default +

    False.

    +
    +Example +derby.drda.logConnections=true + +
    Static or dynamic +

    Dynamic. You can change system values by using commands after the Network +Server has been started.

    Modified: db/derby/docs/branches/10.10/src/adminguide/radminconfigdb2jdrdatracedirectory.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminconfigdb2jdrdatracedirectory.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminconfigdb2jdrdatracedirectory.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminconfigdb2jdrdatracedirectory.dita Mon Nov 11 15:53:35 2013 @@ -20,41 +20,37 @@ limitations under the License. --> derby.drda.traceDirectory property +Indicates the location of tracing files. derby.drda.traceDirectory property -
    Indicates the location of tracing files.
    Security Considerations -

    - The Network Server will attempt to create the trace directory - (and any parent directories) if they do not exist. - This will require that the Java security policy for - derbynet.jar - permits verification of the existence of the named trace directory - and all necessary parent directories. - For each directory created, the policy must allow - - permission java.io.FilePermission "<directory>", "read,write"; - - and for the trace directory itself, the policy must allow - - permission java.io.FilePermission "<tracedirectory>${/}-", "write"; - -

    -

    - See for - information about customizing the Network Server's security policy. -

    -
    -Syntax derby.drda.traceDirectory=tracefiledirectory -
    Default

    If the derby.system.home property - has been set, it is the default. Otherwise, the default is the current directory.

    +

    The Network Server will attempt to create the trace directory (and any parent +directories) if they do not exist. This will require that the Java security +policy for derbynet.jar permits verification of the existence +of the named trace directory and all necessary parent directories. For each +directory created, the policy must allow

    +permission java.io.FilePermission "directory", "read,write"; +

    and for the trace directory itself, the policy must allow

    +permission java.io.FilePermission "tracedirectory${/}-", "write"; +

    See for +information about customizing the Network Server's security policy.

    - Examplederby.drda.traceDirectory=c://trace -
    Static or dynamic

    Dynamic. You can change system -values by using commands after the Network Server has been started.

    +Syntax +derby.drda.traceDirectory=traceFileDirectory + +
    Default +

    If the derby.system.home property has been set, it is the +default. Otherwise, the default is the current directory.

    +
    +Example +derby.drda.traceDirectory=c://trace + +
    Static or dynamic +

    Dynamic. You can change system values by using commands after the Network +Server has been started.

    Modified: db/derby/docs/branches/10.10/src/adminguide/radminconfigportnumber.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminconfigportnumber.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminconfigportnumber.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminconfigportnumber.dita Mon Nov 11 15:53:35 2013 @@ -19,16 +19,22 @@ limitations under the License. --> derby.drda.portNumber property +Indicates the port number to use. derby.drda.portNumber property -
    Indicates the port number to use.
    -Syntaxderby.drda.portNumber=portnumber -
    Default

    If no port number is specified, 1527 is -the default.

    - Examplederby.drda.portNumber=1110 -
    Static or dynamic

    Static. You must restart the Network -Server for changes to take effect.

    +Syntax +derby.drda.portNumber=portNumber + +
    Default +

    If no port number is specified, 1527 is the default.

    +
    +Example +derby.drda.portNumber=1110 + +
    Static or dynamic +

    Static. You must restart the Network Server for changes to take effect.

    +
    Modified: db/derby/docs/branches/10.10/src/adminguide/radminconfigstartnetworkserver.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminconfigstartnetworkserver.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminconfigstartnetworkserver.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminconfigstartnetworkserver.dita Mon Nov 11 15:53:35 2013 @@ -19,29 +19,38 @@ limitations under the License. --> derby.drda.startNetworkServer property +Indicates whether the Network Server will start automatically when +you start . derby.drda.startNetworkServer property
    -

    Use the derby.drda.startNetworkServer property to simplify -embedding the Network Server in your Java application. When you set -derby.drda.startNetworkServer to true, the Network Server will automatically -start when you start -(in this context, -will start when the embedded driver is loaded). Only one Network Server -can be started in a JVM.

    -

    NOTE: -If you start the Network Server with this property set to true, the Network -Server will stop when your application ends or when you stop it by other means -(e.g. by using the Java API, the command line interface, or by shutting down -the Derby system), whichever comes first.

    +

    Use the derby.drda.startNetworkServer property to simplify +embedding the Network Server in your Java application. When you set this +property to true, the Network Server will automatically start when you start + (in this context, + will start when the +embedded driver is loaded). Only one Network Server can be started in a JVM.

    +

    If you start the Network Server with this property set to true, the +Network Server will stop when your application ends or when you stop it by other +means (for example, by using the Java API or the command line interface, or by +shutting down the +system), whichever comes first.

    +
    +Syntax +derby.drda.startNetworkServer={true|false} + +
    Default +

    False.

    +
    +Example +derby.drda.startNetworkServer=true + +
    Static or dynamic +

    Static. You must shut down the Network Server and restart + for this change to take +effect.

    -Syntaxderby.drda.startNetworkServer=[true | false] -
    Default

    False.

    - Examplederby.drda.startNetworkServer=true -
    Static or dynamic

    Static. You must shut down the -Network Server and restart for -this change to take effect.

    Modified: db/derby/docs/branches/10.10/src/adminguide/radminconsist24642.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminconsist24642.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminconsist24642.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminconsist24642.dita Mon Nov 11 15:53:35 2013 @@ -19,28 +19,35 @@ limitations under the License. --> Sample SYSCS_CHECK_TABLE queries +This section provides examples that illustrate how to use the +SYSCS_UTIL.SYSCS_CHECK_TABLE function in queries. QueriesSample -

    This section provides examples that illustrate how to use the -SYSCS_UTIL.SYSCS_CHECK_TABLE function in queries.

    +

    To check the consistency of a single table, run a query that is similar to the one shown in the following example:

    -VALUES SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'FLIGHTS') + +VALUES SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'FLIGHTS') +

    To check the consistency of all of the tables in a schema, stopping at the first failure, run a query that is similar to the one shown in the following example:

    -SELECT tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE( + +SELECT tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE( 'SAMP', tablename) FROM sys.sysschemas s, sys.systables t -WHERE s.schemaname = 'SAMP' AND s.schemaid = t.schemaid +WHERE s.schemaname = 'SAMP' AND s.schemaid = t.schemaid +

    To check the consistency of an entire database, stopping at the first failure, run a query that is similar to the one shown in the following example::

    -SELECT schemaname, tablename, + +SELECT schemaname, tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE(schemaname, tablename) FROM sys.sysschemas s, sys.systables t -WHERE s.schemaid = t.schemaid +WHERE s.schemaid = t.schemaid +
    Modified: db/derby/docs/branches/10.10/src/adminguide/radminconsist30301.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminconsist30301.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminconsist30301.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminconsist30301.dita Mon Nov 11 15:53:35 2013 @@ -19,30 +19,36 @@ limitations under the License. --> The SYSCS_CHECK_TABLE function +The SYSCS_UTIL.SYSCS_CHECK_TABLE function checks the +consistency of a +table. -org.apache.derby.database. ConsistencyChecker.checkTable +org.apache.derby.database.ConsistencyChecker.checkTable -

    The SYSCS_UTIL.SYSCS_CHECK_TABLE() function checks the consistency -of a table. In -particular, the SYSCS_UTIL.SYSCS_CHECK_TABLE function verifies the -following conditions:

      +

      In particular, the SYSCS_UTIL.SYSCS_CHECK_TABLE +function verifies the following conditions:

      • Base tables are internally consistent
      • Base tables and all associated indexes contain the same number of rows
      • The values and row locations in each index match those of the base table
      • All BTREE indexes are internally consistent
      You run this function in an SQL statement, as follows:

      - VALUES SYSCS_UTIL.SYSCS_CHECK_TABLE( - SchemaName, TableName)where SchemaName and TableName are -expressions that evaluate to a string data type. If you created a schema or -table name as a non-delimited identifier, you must present their names in -all upper case. For example:VALUES SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'CITIES') -

      The SYSCS_UTIL.SYSCS_CHECK_TABLE function returns a smallint. -If the table is consistent (or if you run SYSCS_UTIL.SYSCS_CHECK_TABLE on -a view), SYSCS_UTIL.SYSCS_CHECK_TABLE returns a non-zero value. Otherwise, -the function throws an exception on the first inconsistency that it finds.

      -

      For a consistent table, the following result is displayed:

      + +VALUES SYSCS_UTIL.SYSCS_CHECK_TABLE(SchemaName, TableName) +where SchemaName and TableName are expressions that evaluate to a +string data type. If you created a schema or table name as a non-delimited +identifier, you must present their names in all upper case. For example: +VALUES SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'CITIES') + +

      The SYSCS_UTIL.SYSCS_CHECK_TABLE function returns a +SMALLINT. If the table is consistent (or if you run +SYSCS_UTIL.SYSCS_CHECK_TABLE on a view), +SYSCS_UTIL.SYSCS_CHECK_TABLE returns a non-zero value. +Otherwise, the function throws an exception on the first inconsistency that it +finds.

      +

      For a consistent table, the following result is displayed:

      +
      1 ----- 1 Modified: db/derby/docs/branches/10.10/src/adminguide/radminconsist38781.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminconsist38781.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminconsist38781.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminconsist38781.dita Mon Nov 11 15:53:35 2013 @@ -19,15 +19,16 @@ limitations under the License. --> Sample SYSCS_CHECK_TABLE error messages -This section provides examples of error messages that the SYSCS_UTIL.SYSCS_CHECK_TABLE() -function can return. +This section provides examples of error messages that the +SYSCS_UTIL.SYSCS_CHECK_TABLE function can return. SYSCS_CHECK_TABLE error messages

      If the row counts of the base table and an index differ, error message X0Y55 is issued:

      - ERROR X0Y55: The number of rows in the base table does not match + +ERROR X0Y55: The number of rows in the base table does not match the number of rows in at least 1 of the indexes on the table. Index 'T1_I' on table 'APP.T1' has 4 rows, but the base table has 5 rows. The suggested corrective action is to recreate the index. Modified: db/derby/docs/branches/10.10/src/adminguide/radmindrdaStreamOutBufferSize.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radmindrdaStreamOutBufferSize.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radmindrdaStreamOutBufferSize.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radmindrdaStreamOutBufferSize.dita Mon Nov 11 15:53:35 2013 @@ -22,27 +22,36 @@ --> derby.drda.streamOutBufferSize property +Configures the size of the buffer for streaming blob/clob data from +server to client. derby.drda.streamOutBufferSize property -
      -Configure size of buffer for streaming blob/clob from server to client. -If the configured size is 0 or less, the buffer is not placed. - +
      +

      If the configured size is 0 or less, the buffer is not placed.

      -

      This configuration is used when optimizing streaming blob/clob from server to client.

      -

      If there were found many small packets, of which sizes are much lower than maximum size of packet possible in the network, -it will improve performance of streaming to setting this configuration.

      -

      Recommended value of this configuration is maximum packet size possible in the network minus appropriate size for header.

      +This configuration is used when optimizing streaming blob/clob from server to +client. +

      If there were found many small packets, of which sizes are much lower than +maximum size of packet possible in the network, it will improve performance of +streaming to setting this configuration.

      +

      Recommended value of this configuration is maximum packet size possible in +the network minus appropriate size for header.

      -
      -Syntax derby.drda.streamOutBufferSize=size of buffer -
      Default

      0

      - Examplederby.drda.streamOutBufferSize=1024 -
      Static or dynamic

      Dynamic. You can change system -values by using commands after the Network Server has been started.

      +Syntax +derby.drda.streamOutBufferSize=sizeOfBuffer + +
      Default +

      0 (zero).

      +
      +Example +derby.drda.streamOutBufferSize=1024 + +
      Static or dynamic +

      Dynamic. You can change system values by using commands after the Network +Server has been started.

      Modified: db/derby/docs/branches/10.10/src/adminguide/radmindrdahost.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radmindrdahost.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radmindrdahost.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radmindrdahost.dita Mon Nov 11 15:53:35 2013 @@ -20,24 +20,35 @@ limitations under the License. --> derby.drda.host property +Causes the Network Server to listen on a specific network +interface. derby.drda.host property -
      Causes the Network Server to listen on a specific network interface. -This property allows multiple instances of Network Server to run on a single machine, -each using its own unique host:port combination. The host needs to be set -to enable remote connections. By default, the Network Server will listen only -on the loopback address. If the property is set to 0.0.0.0, Network Server -will listen on all interfaces. Ensure that you are running under the security -manager and that user authorization is enabled before you enable remote -connections with this property.
      -Syntax derby.drda.host=hostname -
      Default

      If no host name is specified, the Network Server -listens on the loopback address of the current machine (localhost).

      - Examplederby.drda.host=myhost -
      Static or dynamic

      Static. You must restart the -Network Server for changes to take effect.

      +

      This property allows multiple instances of Network Server to run on +a single machine, each using its own unique host:port combination. The host +needs to be set to enable remote connections.

      +

      By default, the Network Server will listen only on the loopback address. If +the property is set to 0.0.0.0, the Network Server will listen +on all interfaces.

      +

      Ensure that you are running under a security manager and that user +authorization is enabled before you enable remote connections with this +property.

      +
      +Syntax +derby.drda.host=hostName + +
      Default +

      If no host name is specified, the Network Server listens on the loopback +address of the current machine (localhost).

      +
      +Example +derby.drda.host=myhost + +
      Static or dynamic +

      Static. You must restart the Network Server for changes to take effect.

      +
      Modified: db/derby/docs/branches/10.10/src/adminguide/radmindrdakeepalive.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radmindrdakeepalive.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radmindrdakeepalive.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radmindrdakeepalive.dita Mon Nov 11 15:53:35 2013 @@ -19,25 +19,34 @@ limitations under the License. --> derby.drda.keepAlive property +Indicates whether SO_KEEPALIVE is enabled on sockets. derby.drda.keepAlive property -

      Indicates whether SO_KEEPALIVE is enabled on sockets. The keepAlive -mechanism is used to detect when clients disconnect unexpectedly. A keepalive -probe is sent to the client if a long time (by default, more than two -hours) passes with no other data being sent or received. -The .drda.keepAlive property is used to detect and clean up connections for -clients on powered-off machines or clients that have disconnected unexpectedly.

      -

      If the property is set to false, will -not attempt to clean up disconnected clients. The keepAlive mechanism might -be disabled if clients need to resume work without reconnecting even after -being disconnected from the network for some time. To disable keepAlive probes -on Network Server connections, set this property to false.

      -Syntaxderby.drda.keepAlive=[true|false] -
      Default

      True.

      -Examplederby.drdra.keepAlive=false -
      Static or dynamic

      Static. You must restart the Network -Server for changes to take effect.

      +

      The keepAlive mechanism is used to detect when clients disconnect +unexpectedly. A keepalive probe is sent to the client if a long time (by +default, more than two hours) passes with no other data being sent or received. +The derby.drda.keepAlive property is used to detect and clean +up connections for clients on powered-off machines or clients that have +disconnected unexpectedly.

      +

      If the property is set to false, + will not attempt to +clean up disconnected clients. The keepAlive mechanism might be disabled if +clients need to resume work without reconnecting even after being disconnected +from the network for some time. To disable keepAlive probes on Network Server +connections, set this property to false.

      +Syntax +derby.drda.keepAlive={true|false} + +
      Default +

      True.

      +
      +Example +derby.drdra.keepAlive=false + +
      Static or dynamic +

      Static. You must restart the Network Server for changes to take effect.

      +
      Modified: db/derby/docs/branches/10.10/src/adminguide/radmindrdamaxthreads.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radmindrdamaxthreads.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radmindrdamaxthreads.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radmindrdamaxthreads.dita Mon Nov 11 15:53:35 2013 @@ -19,19 +19,30 @@ limitations under the License. --> derby.drda.maxThreads property +Sets the maximum number of connection threads that the Network Server +will allocate. derby.drda.maxThreads property -
      Use the derby.drda.maxThreads property to set a maximum number of -connection threads that Network Server will allocate. If all of the connection -threads are currently being used and the Network Server has already allocated -the maximum number of threads, the threads will be shared by using the derby.drda.timeSlice -property to determine when sessions will be swapped.
      -Syntaxderby.drda.maxThreads=numthreads -
      Default

      0

      - Examplederby.drda.maxThreads=50 -
      Static or dynamic

      Static. You must restart the Network -Server for changes to take effect.

      +
      +

      If all of the connection threads are currently being used and the Network +Server has already allocated the maximum number of threads, the threads will be +shared by using the derby.drda.timeSlice +property to determine when sessions will be swapped.

      +
      +Syntax +derby.drda.maxThreads=numThreads + +
      Default +

      0 (zero).

      +
      +Example +derby.drda.maxThreads=50 + +
      Static or dynamic +

      Static. You must restart the Network Server for changes to take effect.

      +
      Modified: db/derby/docs/branches/10.10/src/adminguide/radmindrdaminthreads.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radmindrdaminthreads.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radmindrdaminthreads.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radmindrdaminthreads.dita Mon Nov 11 15:53:35 2013 @@ -19,17 +19,26 @@ limitations under the License. --> derby.drda.minThreads property +Sets the minimum number of connection threads that the Network Server +will allocate. derby.drda.minThreads property -
      Use the derby.drda.minThreads property to set the minimum number -of connection threads that Network Server will allocate. By default, connection -threads are allocated as needed.
      -Syntaxderby.drda.minThreads=numthreads -
      Default

      0

      -Examplederby.drda.minThreads=10 -
      Static or dynamic

      Static. You must restart the -Network Server for changes to take effect.

      +
      +

      By default, connection threads are allocated as needed.

      +
      +Syntax +derby.drda.minThreads=numThreads + +
      Default +

      0 (zero).

      +
      +Example +derby.drda.minThreads=10 + +
      Static or dynamic +

      Static. You must restart the Network Server for changes to take effect.

      +
      Modified: db/derby/docs/branches/10.10/src/adminguide/radmindrdasecmechanism.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radmindrdasecmechanism.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radmindrdasecmechanism.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radmindrdasecmechanism.dita Mon Nov 11 15:53:35 2013 @@ -20,29 +20,37 @@ limitations under the License. --> derby.drda.securityMechanism property +Restricts the client connections based on the security +mechanism. derby.drda.securityMechanism propertypropertiesderby.drda.securityMechanism -

      The derby.drda.securityMechanism property restricts -the client connections based on the security mechanism.

      -

      If the derby.drda.securityMechanism property -is set to a valid mechanism, the Network Server accepts only connections which -use that security mechanism. No other types of connections are accepted. -If the derby.drda.securityMechanism property is not set, the -Network Server -accepts any connection which uses a valid security mechanism.

      -Syntaxderby.drda.securityMechanism = [ +
      +

      If the derby.drda.securityMechanism property is set to a +valid mechanism, the Network Server accepts only connections which use that +security mechanism. No other types of connections are accepted. If the +derby.drda.securityMechanism property is not set, the Network +Server accepts any connection which uses a valid security mechanism.

      +
      +Syntax +derby.drda.securityMechanism={ USER_ONLY_SECURITY | CLEAR_TEXT_PASSWORD_SECURITY | ENCRYPTED_USER_AND_PASSWORD_SECURITY -] -
      Default

      None.

      - Examplederby.drda.securityMechanism=USER_ONLY_SECURITY - The server that runs with this setting accepts only client -connections with the USER_ONLY_SECURITY value. -
      Static or dynamic

      Static. You must restart the Network -Server for the changes that are associated with this property to take effect.

      +}
      +
      +
      Default +

      None.

      +
      +Example +derby.drda.securityMechanism=USER_ONLY_SECURITY +

      The server that runs with this setting accepts only client connections with +the USER_ONLY_SECURITY value.

      +
      +
      Static or dynamic +

      Static. You must restart the Network Server for changes to take effect.

      +
      Modified: db/derby/docs/branches/10.10/src/adminguide/radmindrdasslmode.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radmindrdasslmode.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radmindrdasslmode.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radmindrdasslmode.dita Mon Nov 11 15:53:35 2013 @@ -20,26 +20,31 @@ limitations under the License. --> derby.drda.sslMode property +Indicates whether the client connection is encrypted or not, and +whether certificate-based peer authentication is enabled. derby.drda.sslMode propertypropertiesderby.drda.sslMode -

      The derby.drda.sslMode property indicates whether the client -connection is encrypted or not, and whether certificate based peer -authentication is enabled.

      -
      Syntax - -derby.drda.sslMode = [ off | basic | peerAuthentication ] - +derby.drda.sslMode={ + off | + basic | + peerAuthentication +} -
      Default

      off

      - Examplederby.drda.sslMode=basic - The server that runs with this setting accepts client -connections encrypted with SSL. -
      Static or dynamic

      Static. You must restart the Network -Server for the changes that are associated with this property to take effect.

      +
      Default +

      off.

      +
      +Example +derby.drda.sslMode=basic +

      The server that runs with this setting accepts client connections encrypted +with SSL.

      +
      +
      Static or dynamic +

      Static. You must restart the Network Server for changes to take effect.

      +
      Modified: db/derby/docs/branches/10.10/src/adminguide/radmindrdatimeslice.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radmindrdatimeslice.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radmindrdatimeslice.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radmindrdatimeslice.dita Mon Nov 11 15:53:35 2013 @@ -19,18 +19,28 @@ limitations under the License. --> derby.drda.timeSlice property +Sets the number of milliseconds that each connection will use before +yielding to another connection. derby.drda.timeSlice property -
      Use the derby.drda.timeSlice property to set the number of milliseconds -that each connection will use before yielding to another connection. This -property is relevant only if the derby.drda.maxThreads property is set -to a value greater than zero.
      -Syntaxderby.drda.timeSlice=milliseconds -
      Default

      0

      - Examplederby.drda.timeSlice=2000 -
      Static or dynamic

      Static. You must restart the Network -Server for changes to take effect.

      +

      +This property is relevant only if the +derby.drda.maxThreads +property is set to a value greater than zero.

      +
      +Syntax +derby.drda.timeSlice=milliseconds + +
      Default +

      0 (zero).

      +
      +Example +derby.drda.timeSlice=2000 + +
      Static or dynamic +

      Static. You must restart the Network Server for changes to take effect.

      +
      Modified: db/derby/docs/branches/10.10/src/adminguide/radminembeddedserverex.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminembeddedserverex.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminembeddedserverex.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminembeddedserverex.dita Mon Nov 11 15:53:35 2013 @@ -19,13 +19,19 @@ limitations under the License. --> Embedded server example +You can start the Network Server in another thread automatically +when starts by setting +the derby.drda.startNetworkServer property, or you can start it +by using a program. Embedded server example -

      You can start the Network Server in another thread automatically -when starts by setting -the derby.drda.startNetworkServer property (see ), or you can start it by using a program. The following example shows how to start the Network Server by using a program:

      +

      See +for details on this property.

      +

      The following example shows how to start the Network Server by using +a program:

      import org.apache.derby.drda.NetworkServerControl; import java.net.InetAddress; NetworkServerControl server = new NetworkServerControl Modified: db/derby/docs/branches/10.10/src/adminguide/radminexportarguments.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminexportarguments.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminexportarguments.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminexportarguments.dita Mon Nov 11 15:53:35 2013 @@ -29,61 +29,61 @@ procedures use specific parameters.
      -
      SCHEMANAME
      +
      SCHEMANAME
      Specifies the schema of the table. You can specify a NULL value to use the -default schema name. The SCHEMANAME parameter takes an +default schema name. The SCHEMANAME parameter takes an input argument that is a VARCHAR(128) data type.
      -
      SELECTSTATEMENT
      +
      SELECTSTATEMENT
      Specifies the SELECT statement query that returns the data to be exported. Specifying a NULL value will result in an error. The -SELECTSTATEMENT parameter takes an input argument that is +SELECTSTATEMENT parameter takes an input argument that is a VARCHAR(32672) data type.
      -
      TABLENAME
      +
      TABLENAME
      Specifies the table name of the table or view from which the data is to be exported. This table cannot be a system table or a declared temporary table. The string must exactly match the case of the table name. Specifying a NULL -value results in an error. The TABLENAME parameter takes +value results in an error. The TABLENAME parameter takes an input argument that is a VARCHAR(128) data type.
      -
      FILENAME
      +
      FILENAME
      Specifies the file to which the data is to be exported. If the path is omitted, the current working directory is used. If the name of a file that already exists is specified, the export utility overwrites the contents of the file; it does not append the information. The specified location of the file should refer to the server-side location if you are using the Network Server. -Specifying a NULL value results in an error. The FILENAME +Specifying a NULL value results in an error. The FILENAME parameter takes an input argument that is a VARCHAR(32672) data type.
      -
      COLUMNDELIMITER
      +
      COLUMNDELIMITER
      Specifies a column delimiter. The specified character is used in place of a comma to signify the end of a column. You can specify a NULL value to use the -default value of a comma. The COLUMNDELIMITER parameter +default value of a comma. The COLUMNDELIMITER parameter must be a CHAR(1) data type.
      -
      CHARACTERDELIMITER
      +
      CHARACTERDELIMITER
      Specifies a character delimiter. The specified character is used in place of double quotation marks to enclose a character string. You can specify a NULL value to use the default value of a double quotation mark. The -CHARACTERDELIMITER parameter takes an input argument that +CHARACTERDELIMITER parameter takes an input argument that is a CHAR(1) data type.
      -
      CODESET
      +
      CODESET
      Specifies the code set of the data in the export file. The code set name -should be one of the Java supported character encoding sets. Data is converted +should be one of the Java supported character encoding sets. Data is converted from the database code page to the specified code page before writing to the file. You can specify a NULL value to write the data in the same code page -as the JVM in which it is being executed. The CODESET +as the JVM in which it is being executed. The CODESET parameter takes an input argument that is a VARCHAR(128) data type.
      -
      LOBSFILENAME
      +
      LOBSFILENAME
      Specifies the file that the large object data is exported to. If the path is omitted, the LOB file is created in the same directory as the main export file. If you specify the name of an existing file, the export utility overwrites the contents of the file. The data is not appended to the file. If you are using the Network Server, the file should be in a server-side location. Specifying a NULL -value results in an error. The LOBSFILENAME parameter takes +value results in an error. The LOBSFILENAME parameter takes an input argument that is a VARCHAR(32672) data type.

      If you create a schema, table, or column name as a non-delimited identifier, Modified: db/derby/docs/branches/10.10/src/adminguide/radminimport64241.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminimport64241.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminimport64241.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminimport64241.dita Mon Nov 11 15:53:35 2013 @@ -30,68 +30,68 @@ procedures use specific parameters.

      -
      SCHEMANAME
      +
      SCHEMANAME
      Specifies the schema of the table. You can specify a NULL value to use -the default schema name. The SCHEMANAME parameter takes +the default schema name. The SCHEMANAME parameter takes an input argument that is a VARCHAR(128) data type.
      -
      TABLENAME
      +
      TABLENAME
      Specifies the name of the table into which the data is to be imported. This table cannot be a system table or a declared temporary table. The string must exactly match the case of the table name. Specifying a NULL value results -in an error. The TABLENAME parameter takes an input +in an error. The TABLENAME parameter takes an input argument that is a VARCHAR(128) data type.
      -
      INSERTCOLUMNS
      +
      INSERTCOLUMNS
      Specifies the comma-separated column names of the table into which the data will be imported. You can specify a NULL value to import into all columns -of the table. The INSERTCOLUMNS parameter takes an input +of the table. The INSERTCOLUMNS parameter takes an input argument that is a VARCHAR(32672) data type.
      -
      COLUMNINDEXES
      +
      COLUMNINDEXES
      Specifies the comma-separated column indexes (numbered from one) of the input data fields that will be imported. You can specify a NULL value to use all -input data fields in the file. The COLUMNINDEXES parameter +input data fields in the file. The COLUMNINDEXES parameter takes an input argument that is a VARCHAR(32672) data type.
      -
      FILENAME
      +
      FILENAME
      Specifies the name of the file that contains the data to be imported. If the path is omitted, the current working directory is used. The specified location of the file should refer to the server side location if you are using the Network Server. Specifying a NULL value results in an error. The -FILENAME parameter takes an input argument that is a +FILENAME parameter takes an input argument that is a VARCHAR(32672) data type.
      -
      COLUMNDELIMITER
      +
      COLUMNDELIMITER
      Specifies a column delimiter. The specified character is used in place of a comma to signify the end of a column. You can specify a NULL value to -use the default value of a comma. The COLUMNDELIMITER +use the default value of a comma. The COLUMNDELIMITER parameter takes an input argument that is a CHAR(1) data type.
      -
      CHARACTERDELIMITER
      +
      CHARACTERDELIMITER
      Specifies a character delimiter. The specified character is used in place of double quotation marks to enclose a character string. You can specify a NULL value to use the default value of a double quotation mark. The -CHARACTERDELIMITER parameter takes an input argument that +CHARACTERDELIMITER parameter takes an input argument that is a CHAR(1) data type.
      -
      CODESET
      +
      CODESET
      Specifies the code set of the data in the input file. The code set name should be one of the Java supported character encoding sets. Data is converted from the specified code set to the database code set (UTF-8). You can specify a NULL value to interpret the data file in the same code set as the JVM in -which it is being executed. The CODESET parameter takes +which it is being executed. The CODESET parameter takes an input argument that is a VARCHAR(128) data type.
      -
      REPLACE
      -
      A non-zero value for the replace parameter will import in REPLACE mode, -while a zero value will import in INSERT mode. REPLACE mode deletes all existing -data from the table by truncating the table and inserts the imported data. -The table definition and the index definitions are not changed. You can import -with REPLACE mode only if the table already exists. INSERT mode adds the -imported data to the table without changing the existing table data. Specifying -a NULL value results in an error. The REPLACE parameter -takes an input argument that is a SMALLINT data type.
      +
      REPLACE
      +
      A non-zero value for the REPLACE parameter will import in +REPLACE mode, while a zero value will import in INSERT mode. REPLACE mode +deletes all existing data from the table by truncating the table and inserts the +imported data. The table definition and the index definitions are not changed. +You can import with REPLACE mode only if the table already exists. INSERT mode +adds the imported data to the table without changing the existing table data. +Specifying a NULL value results in an error. The REPLACE +parameter takes an input argument that is a SMALLINT data type.

      If you create a schema, table, or column name as a non-delimited identifier, you must pass the name to the import procedure using all uppercase characters. Modified: db/derby/docs/branches/10.10/src/adminguide/radminimport91458.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminimport91458.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminimport91458.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminimport91458.dita Mon Nov 11 15:53:35 2013 @@ -34,8 +34,8 @@ limitations under the License.

      The following example shows how to import data into the STAFF table in a sample database from the myfile.del file. The data will be appended to the existing data in the table.

      -CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE( - null,'STAFF','myfile.del',null,null,null,0); +CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE( + null,'STAFF','myfile.del',null,null,null,0);
      Example: Importing all data from a delimited file

      The following example shows how to import data into the STAFF table in a @@ -43,8 +43,8 @@ sample database from a delimited data fi example defines the percentage character (%) as the string delimiter, and a semicolon as the column delimiter. The data will be appended to the existing data in the table.

      -CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE( - null,'STAFF','c:\output\myfile.del',';','%',null,0); +CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE( + null,'STAFF','c:\output\myfile.del',';','%',null,0);
      Example: Importing all data from a table, using a separate import file for the LOB data @@ -54,8 +54,8 @@ import file staff.del i references that point to a separate file which contains the LOB data. This example specifies a comma as the column delimiter. The data will be appended to the existing data in the table.

      -CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE_LOBS_FROM_EXTFILE( - null,'STAFF','c:\data\staff.del',',','"','UTF-8',0); +CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE_LOBS_FROM_EXTFILE( + null,'STAFF','c:\data\staff.del',',','"','UTF-8',0);
      Example: Importing data into specific columns, using a separate import file for the LOB data @@ -67,16 +67,16 @@ file which contains the LOB data. The da double quotation marks (") as the string delimiter and a comma (,) as the column delimiter. The data will be appended to the existing data in the STAFF table.

      -CALL SYSCS_UTIL.SYSCS_IMPORT_DATA_LOBS_FROM_EXTFILE( +CALL SYSCS_UTIL.SYSCS_IMPORT_DATA_LOBS_FROM_EXTFILE( null, 'STAFF', 'NAME,DEPT,SALARY,PICTURE', '2,3,4,6', - 'c:\data\staff.del', ',','"','UTF-8', 0); + 'c:\data\staff.del', ',','"','UTF-8', 0);
      Example: Exporting all data from a table to a single export file

      The following example shows how to export data from the STAFF table in a sample database to the file myfile.del.

      -CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE( - null,'STAFF','myfile.del',null,null,null); +CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE( + null,'STAFF','myfile.del',null,null,null);
      Example: Exporting data from a table to a single delimited export file @@ -84,25 +84,25 @@ export file delimited data file, myfile.del, with the percentage character (%) as the character delimiter, and a semicolon as the column delimiter from the STAFF table.

      -CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE( - null,'STAFF','c:\output\myfile.del',';','%',null); +CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE( + null,'STAFF','c:\output\myfile.del',';','%',null);
      Example: Exporting all data from a table, using a separate export file for the LOB data

      The following example shows how to export data from the STAFF table in a sample database to the main file, staff.del, and the LOB export file, pictures.dat.

      -CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE_LOBS_TO_EXTFILE(null,'STAFF', - 'c:\data\staff.del',',','"','UTF-8', 'c:\data\pictures.dat'); +CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE_LOBS_TO_EXTFILE(null,'STAFF', + 'c:\data\staff.del',',','"','UTF-8', 'c:\data\pictures.dat');
      Example: Exporting data from a query to a single export file

      The following example shows how to export employee data in department 20 from the STAFF table in a sample database to the file awards.del.

      -CALL SYSCS_UTIL.SYSCS_EXPORT_QUERY( +CALL SYSCS_UTIL.SYSCS_EXPORT_QUERY( 'SELECT * FROM STAFF WHERE dept=20', - 'c:\output\awards.del',null,null,null); + 'c:\output\awards.del',null,null,null);
      Example: Exporting data from a query, using a separate export file for the LOB data @@ -110,10 +110,10 @@ file for the LOB data the STAFF table in a sample database to the main file, staff.del, and the LOB data to the file pictures.dat.

      -CALL SYSCS_UTIL.SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE( +CALL SYSCS_UTIL.SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE( 'SELECT * FROM STAFF WHERE dept=20', 'c:\data\staff.del', ',' ,'"', - 'UTF-8','c:\data\pictures.dat'); + 'UTF-8','c:\data\pictures.dat');
      Modified: db/derby/docs/branches/10.10/src/adminguide/radminimportcodeset.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminimportcodeset.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminimportcodeset.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminimportcodeset.dita Mon Nov 11 15:53:35 2013 @@ -38,12 +38,12 @@ of character encodings, refer to your Ja procedures

      The following example shows how to specify UTF-8 encoding to export to the staff.dat table:

      -CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE( - NULL,'STAFF','staff.dat',NULL,NULL,'UTF-8') +CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE( + NULL,'STAFF','staff.dat',NULL,NULL,'UTF-8')

      The following example shows how to specify UTF-8 encoding to import from the staff.dat table:

      -CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE( - NULL,'STAFF','staff.dat',NULL,NULL,'UTF-8',0) +CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE( + NULL,'STAFF','staff.dat',NULL,NULL,'UTF-8',0)
      Modified: db/derby/docs/branches/10.10/src/adminguide/radminjmxcode.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminjmxcode.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminjmxcode.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminjmxcode.dita Mon Nov 11 15:53:35 2013 @@ -20,6 +20,9 @@ limitations under the License. Using custom Java code to access the <ph conref="../conrefs.dita#prod/productshortname"></ph> MBeans +In addition to using a tool like JConsole, you can also access the + MBeans from a Java +application. Java Management Extensions (JMX) technology JMXusing custom Java code @@ -27,12 +30,10 @@ limitations under the License.
      -

      In addition to using a tool like JConsole, you can also access the - MBeans from a Java -application. How to do this may depend on how you configure the JVM that is -running , how you -configure user authentication and authorization, or the host(s) from which you -want to access the MBeans.

      +

      How to do this may depend on how you configure the JVM that is running +, how you configure user +authentication and authorization, or the host(s) from which you want to access +the MBeans.

      This section has some example code to help you get started. You will find the JMX classes you need in the packages javax.management and javax.management.remote.

      @@ -160,8 +161,8 @@ a ManagementMBean:

      MBean's object name:

      // assuming we already have a reference to the ObjectName - // of an MBean registered by Derby, for example the - // Derby-registered ManagementMBean + // of an MBean registered by , for example the + // -registered ManagementMBean String systemID = derbyMgmtObjectName.getKeyProperty("system");
      Accessing a specific @@ -186,7 +187,7 @@ fully specifying its <codeph>String</cod keyProps.put("type", "Version"); keyProps.put("jar", "derby.jar"); keyProps.put("system", systemID); - // MBeans registered by Derby always belong to the + // MBeans registered by <ph conref="../conrefs.dita#prod/productshortname"></ph> always belong to the // "org.apache.derby" domain ObjectName versionObjectName = new ObjectName("org.apache.derby", keyProps); Modified: db/derby/docs/branches/10.10/src/adminguide/radminjmxdisable.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminjmxdisable.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminjmxdisable.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminjmxdisable.dita Mon Nov 11 15:53:35 2013 @@ -19,6 +19,9 @@ limitations under the License. --> <reference id="radminjmxdisable" xml:lang="en-us"> <title>Disabling access to MBeans +You may wish to disable or restrict access to MBeans in +security-conscious environments. You can do this using either of the following +techniques. Java Management Extensions (JMX) technology JMXdisabling access @@ -26,8 +29,6 @@ limitations under the License.
      -

      You may wish to disable or restrict access to MBeans in security-conscious -environments. You can do this using either of the following techniques.

      The first technique is to use the stopManagement() method of ManagementMBean. This method unregisters all of the MBeans except @@ -38,9 +39,9 @@ policy that does not grant derby register MBeans. For example, you can modify the Network Server's basic policy (see ) by commenting out this section:

      -// Allows access to Derby's built-in MBeans, within the domain +// Allows access to 's built-in MBeans, within the domain // org.apache.derby. -// Derby must be allowed to register and unregister these MBeans. +// must be allowed to register and unregister these MBeans. // It is possible to allow access only to specific MBeans, attributes or // operations. To fine tune this permission, see the javadoc of // javax.management.MBeanPermission or the JMX Instrumentation and Agent Modified: db/derby/docs/branches/10.10/src/adminguide/radminjmxenabledisable.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminjmxenabledisable.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminjmxenabledisable.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminjmxenabledisable.dita Mon Nov 11 15:53:35 2013 @@ -19,6 +19,8 @@ limitations under the License. --> Enabling and disabling JMX +You can use JMX management and monitoring both locally and +remotely. Java Management Extensions (JMX) technology JMXenabling and disabling @@ -26,13 +28,13 @@ limitations under the License.
      -

      You can use JMX management and monitoring both locally and remotely. The -term local means on the same host (machine) and running -as the same user. For example, this means that local JMX access is possible -only if the JVM you want to access is running on the same host and as the same -user as the user who is running a JMX client such as JConsole (or a different user -with sufficient file system permissions). In order to allow other users to access -the JVM, or to allow access from other hosts, remote JMX must be enabled.

      +

      The term local means on the same host (machine) and +running as the same user. For example, this means that local JMX access +is possible only if the JVM you want to access is running on the same host and +as the same user as the user who is running a JMX client such as JConsole (or a +different user with sufficient file system permissions). In order to allow other +users to access the JVM, or to allow access from other hosts, remote JMX must be +enabled.

      Local JMX access

      If you are using a Java SE 6 or later JVM, local JMX management and Modified: db/derby/docs/branches/10.10/src/adminguide/radminjmxenablenoauth.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminjmxenablenoauth.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminjmxenablenoauth.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminjmxenablenoauth.dita Mon Nov 11 15:53:35 2013 @@ -19,6 +19,10 @@ limitations under the License. --> Enabling remote JMX with no authentication or SSL +The following simple example starts the + Network Server on the +command line with insecure remote JMX management and monitoring enabled, +using an Oracle JDK 6 or later JVM. Java Management Extensions (JMX) technology JMXenabling without authentication @@ -26,12 +30,8 @@ limitations under the License.

      -

      The following simple example starts the - Network Server on the -command line with insecure remote JMX management and monitoring enabled, -using an Oracle JDK 6 or later JVM. Password authentication over SSL is enabled by -default, but here these security features are disabled, to keep the example -simple.

      +

      Password authentication over SSL is enabled by default, but here these +security features are disabled, to keep the example simple.

      It is not recommended to disable authentication or SSL in production environments.

      java -Dcom.sun.management.jmxremote.port=9999 Modified: db/derby/docs/branches/10.10/src/adminguide/radminjmxenablepolicy.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/radminjmxenablepolicy.dita?rev=1540756&r1=1540755&r2=1540756&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/adminguide/radminjmxenablepolicy.dita (original) +++ db/derby/docs/branches/10.10/src/adminguide/radminjmxenablepolicy.dita Mon Nov 11 15:53:35 2013 @@ -19,6 +19,8 @@ limitations under the License. --> Fine-grained authorization using a security policy +When you start the Network Server from the command line, it installs +a security manager and a basic security policy by default. Java Management Extensions (JMX) technology JMXusing a security policy @@ -26,10 +28,8 @@ limitations under the License.
      -

      When you start the Network Server from the command line, it installs a -security manager and a basic security policy by default. This policy includes -the required permissions to allow JMX users to access the - MBeans if JMX user +

      This policy includes the required permissions to allow JMX users to access +the MBeans if JMX user authentication is disabled. If JMX user authentication is enabled, you may need to grant additional permissions to specific users (JMXPrincipals).

      The NetworkServerMBean's ping operation @@ -64,7 +64,7 @@ included in the code. Additional permiss // grant principal javax.management.remote.JMXPrincipal "controlRole" { - // Derby system permissions (what is the user allowed to do?) + // system permissions (what is the user allowed to do?) // See API docs for SystemPermission and the specific MBeans for // details. permission org.apache.derby.security.SystemPermission "jmx", "control"; @@ -92,7 +92,7 @@ grant principal javax.management.remote. // Extra permissions for application controlled ManagementMBean: // Not needed if you do not intend to create/register your own - // Derby Management MBean. + // Management MBean. // Wildcards (*) allow all domains, key properties and MBean members. // You may want to be more specific here. permission javax.management.MBeanPermission @@ -104,7 +104,7 @@ grant principal javax.management.remote. // // jconsole: // - most of these permissions are needed to let JConsole query the - // MBean server and display information about Derby's mbeans as well + // MBean server and display information about 's mbeans as well // as some default platform MBeans/MXBeans. // - if you don't use JConsole, but query the MBean server from your // JMX client app, some of these permissions may be needed. @@ -139,12 +139,12 @@ grant principal javax.management.remote. grant codeBase "${derby.install.url}derby.jar" { - // Allows Derby to create an MBeanServer: + // Allows to create an MBeanServer: // permission javax.management.MBeanServerPermission "createMBeanServer"; - // Allows access to Derby's built-in MBeans, within the domain - // org.apache.derby. Derby must be allowed to register and unregister + // Allows access to 's built-in MBeans, within the domain + // org.apache.derby. must be allowed to register and unregister // these MBeans. // It is possible to allow access only to specific MBeans, attributes, // or operations. To fine-tune this permission, see the API doc of @@ -155,12 +155,12 @@ grant codeBase "${derby.install.url}derb "org.apache.derby.*#[org.apache.derby:*]", "registerMBean,unregisterMBean"; - // Trusts Derby code to be a source of MBeans and to register these in + // Trusts code to be a source of MBeans and to register these in // the MBean server. // permission javax.management.MBeanTrustPermission "register"; - // Gives permission for JMX to be used against Derby. + // Gives permission for JMX to be used against . // If JMX user authentication is being used, a whole set of // fine-grained permissions needs to be granted to allow specific // users access to MBeans and actions they perform (see JMXPrincipal @@ -191,7 +191,7 @@ grant codeBase "${derby.install.url}derb // permission java.net.SocketPermission "*", "connect,resolve"; - // Gives permission for JMX to be used against Derby. + // Gives permission for JMX to be used against . // If JMX user authentication is being used, a whole set of // fine-grained permissions need to be granted to allow specific users // access to MBeans and actions they perform (see JMXPrincipal