You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by be...@apache.org on 2007/07/02 10:29:51 UTC
svn commit: r552431 - in /db/derby/docs/branches/10.3/src: adminguide/
devguide/ getstart/ ref/ tools/
Author: bernt
Date: Mon Jul 2 01:29:49 2007
New Revision: 552431
URL: http://svn.apache.org/viewvc?view=rev&rev=552431
Log:
DERBY-2882 Merged from trunk with svn merge -r 552429:552430 https://svn.apache.org/repos/asf/db/derby/docs/trunk
Removed:
db/derby/docs/branches/10.3/src/getstart/cgschoos.dita
db/derby/docs/branches/10.3/src/ref/rrefjta94396.dita
Modified:
db/derby/docs/branches/10.3/src/adminguide/cadminappsthenetworkserverandjvms.dita
db/derby/docs/branches/10.3/src/devguide/cdevcsecure31493.dita
db/derby/docs/branches/10.3/src/devguide/cdevcsecure88690.dita
db/derby/docs/branches/10.3/src/devguide/cdevcsecure96815.dita
db/derby/docs/branches/10.3/src/devguide/cdevresman19524.dita
db/derby/docs/branches/10.3/src/devguide/cdevstart18978.dita
db/derby/docs/branches/10.3/src/ref/refderby.ditamap
db/derby/docs/branches/10.3/src/tools/ctools1003034.dita
db/derby/docs/branches/10.3/src/tools/rtoolsijcomref11943.dita
db/derby/docs/branches/10.3/src/tools/rtoolsijcomref44032.dita
db/derby/docs/branches/10.3/src/tools/rtoolsijcomref53869.dita
db/derby/docs/branches/10.3/src/tools/rtoolsijcomref61708.dita
db/derby/docs/branches/10.3/src/tools/rtoolsijcomref62772.dita
db/derby/docs/branches/10.3/src/tools/rtoolsijcomref79286.dita
db/derby/docs/branches/10.3/src/tools/rtoolsijcomref94092.dita
db/derby/docs/branches/10.3/src/tools/rtoolsijcomref97975.dita
db/derby/docs/branches/10.3/src/tools/rtoolsijpropref97949.dita
Modified: db/derby/docs/branches/10.3/src/adminguide/cadminappsthenetworkserverandjvms.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/adminguide/cadminappsthenetworkserverandjvms.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/adminguide/cadminappsthenetworkserverandjvms.dita (original)
+++ db/derby/docs/branches/10.3/src/adminguide/cadminappsthenetworkserverandjvms.dita Mon Jul 2 01:29:49 2007
@@ -24,7 +24,7 @@
<prolog></prolog>
<conbody>
<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server is compatible with <ph><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 2 Platform, Standard Edition, v 1.3.1
+tmtype="tm" trademark="Java">Java</tm> 2 Platform, Standard Edition, v 1.4.2
(J2SE)</ph> and above.</p>
</conbody>
</concept>
Modified: db/derby/docs/branches/10.3/src/devguide/cdevcsecure31493.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/devguide/cdevcsecure31493.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/devguide/cdevcsecure31493.dita (original)
+++ db/derby/docs/branches/10.3/src/devguide/cdevcsecure31493.dita Mon Jul 2 01:29:49 2007
@@ -29,6 +29,7 @@
<conbody>
<p>You must specify the full package and class name of the provider, and you
must also add the libraries to the application's classpath.</p>
+<!-- I assume to use jce_jdk13-10b4.zip here is ok since it's an example. Bernt -->
<codeblock><b>-- using the the provider library jce_jdk13-10b4.zip|
-- available from www.bouncycastle.org</b>
jdbc:derby:encryptedDB3;create=true;dataEncryption=true;
Modified: db/derby/docs/branches/10.3/src/devguide/cdevcsecure88690.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/devguide/cdevcsecure88690.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/devguide/cdevcsecure88690.dita (original)
+++ db/derby/docs/branches/10.3/src/devguide/cdevcsecure88690.dita Mon Jul 2 01:29:49 2007
@@ -33,12 +33,10 @@
as follows:</p>
<ul>
<li>For J2SE/J2EE 1.4 or higher, the JRE's provider is the default.</li>
-<li>For an IBM Corp J2SE/J2EE 1.3 JRE, the default provider is <i>com.ibm.crypto.provider</i>.</li>
-<li>For a Sun Microsystem J2SE/J2EE 1.3 JRE, the default provider is <i>com.sun.crypto.provider.SunJCE</i>. </li>
-<li>For any other J2SE/J2EE 1.3 JRE, a provider must be specified.</li>
+<li>If your environment for some reason does not include a provider, it must be specified.</li>
</ul>
<p>You have the option of specifying an alternate encryption provider. The
default encryption algorithm is DES, but you have the option of specifying
-an alternate algorithm as well.</p>
+an alternate algorithm as well. See <xref href="cdevcsecure31493.dita#cdevcsecure31493"></xref></p>
</conbody>
</concept>
Modified: db/derby/docs/branches/10.3/src/devguide/cdevcsecure96815.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/devguide/cdevcsecure96815.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/devguide/cdevcsecure96815.dita (original)
+++ db/derby/docs/branches/10.3/src/devguide/cdevcsecure96815.dita Mon Jul 2 01:29:49 2007
@@ -20,28 +20,19 @@
-->
<concept id="cdevcsecure96815" xml:lang="en-us">
<title>Requirements for Derby encryption</title>
-<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> supports
-disk encryption, but you must supply the following items.</shortdesc>
<prolog><metadata>
<keywords><indexterm>Encryption<indexterm>providers</indexterm></indexterm>
<indexterm>Data encryption<indexterm>providers</indexterm></indexterm></keywords>
</metadata></prolog>
<conbody>
-<ul>
-<li>An implementation of the Java Cryptographic Extension (JCE) package version
-1.2.1 or higher. <p><ph conref="../conrefs.dita#prod/productshortname"></ph> does
-not support earlier, non-exportable, versions of JCE (such as JCE 1.2). More
-information on JCE 1.2.1, including a product download, can be found at: <synph><var>http://java.sun.com/products/jce/index.html</var></synph>. </p
-> <p>Any attempt to create or access an encrypted database without the libraries
-for an implementation of JCE of the proper version, or without Java 2 Platform,
-Standard Edition, v 1.2 (J2SE) or higher, raises an exception; you will not
-be able to create or boot the database.</p> <note>The JCE installation documentation
-describes configuring (registering) the JCE software. You do not need to do
-this; <ph conref="../conrefs.dita#prod/productshortname"></ph> registers JCE
-dynamically. </note></li>
-<li>The encryption provider <p>An encryption provider implements the Java
-cryptography concepts. The JRE for J2SE 1.4 or J2EE 1.4 includes JCE and one
-or more default encryption providers.</p></li>
-</ul>
+<p>
+<ph conref="../conrefs.dita#prod/productshortname"></ph> supports disk
+encryption and requires an encryption provider. An encryption provider
+implements the Java cryptography concepts. The JRE for J2SE 1.4 and
+higher includes Java Cryptographic Extensions (JCE <xref format="html"
+href="http://java.sun.com/products/jce/index.html"
+scope="external">http://java.sun.com/products/jce/index.html</xref>)
+and one or more default encryption providers.
+</p>
</conbody>
</concept>
Modified: db/derby/docs/branches/10.3/src/devguide/cdevresman19524.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/devguide/cdevresman19524.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/devguide/cdevresman19524.dita (original)
+++ db/derby/docs/branches/10.3/src/devguide/cdevresman19524.dita Mon Jul 2 01:29:49 2007
@@ -51,7 +51,5 @@
Extensions" in the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>.</p>
<p>This chapter describes the <ph conref="../conrefs.dita#prod/productshortname"></ph> classes
that implement the APIs and provides some implementation-specific details.</p>
-<note>All of the classes described in this chapter require a Java 2 Platform,
-Standard Edition, v 1.2 (J2SE) or higher environment.</note>
</conbody>
</concept>
Modified: db/derby/docs/branches/10.3/src/devguide/cdevstart18978.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/devguide/cdevstart18978.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/devguide/cdevstart18978.dita (original)
+++ db/derby/docs/branches/10.3/src/devguide/cdevstart18978.dita Mon Jul 2 01:29:49 2007
@@ -21,7 +21,7 @@
<concept id="cdevstart18978" xml:lang="en-us">
<title>Derby and JVMs</title>
<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> is a database
-engine written completely in Java; it will run in any JVM, version 1.3 or
+engine written completely in Java; it will run in any JVM, version 1.4 or
higher.</shortdesc>
<prolog><metadata>
<keywords><indexterm>JVMs (Java Virtual Machines)<indexterm>verified for Derby</indexterm></indexterm>
Modified: db/derby/docs/branches/10.3/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/ref/refderby.ditamap?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/ref/refderby.ditamap (original)
+++ db/derby/docs/branches/10.3/src/ref/refderby.ditamap Mon Jul 2 01:29:49 2007
@@ -609,8 +609,6 @@
</topicref>
</topicref>
<topicref collection-type="family" href="rrefjta16677.dita" navtitle="J2EE Compliance: Java Transaction API and javax.sql Interfaces">
-<topicref href="rrefjta94396.dita" navtitle="JVM and libraries for J2EE features">
-</topicref>
<topicref collection-type="family" href="rrefjta51021.dita" navtitle="The JTA API ">
<topicref collection-type="family" href="rrefjta1003392.dita" navtitle="Notes on Product Behavior">
<topicref href="rrefjta1003415.dita" navtitle="Recovered Global Transactions">
Modified: db/derby/docs/branches/10.3/src/tools/ctools1003034.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/tools/ctools1003034.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/tools/ctools1003034.dita (original)
+++ db/derby/docs/branches/10.3/src/tools/ctools1003034.dita Mon Jul 2 01:29:49 2007
@@ -18,12 +18,12 @@
limitations under the License.
-->
<concept id="ctools1003034" xml:lang="en-us">
-<title>Java 2 Platform, Standard Edition, Version 1.3</title>
+<title>Java 2 Platform, Standard Edition, Version 1.4</title>
<prolog><metadata>
<keywords></keywords>
</metadata></prolog>
<conbody>
<p>All <ph conref="../conrefs.dita#prod/productshortname"></ph> tools require
-the Java 2 Platform, Standard Edition, Version 1.3 or later.</p>
+the Java 2 Platform, Standard Edition, Version 1.4 or later.</p>
</conbody>
</concept>
Modified: db/derby/docs/branches/10.3/src/tools/rtoolsijcomref11943.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/tools/rtoolsijcomref11943.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/tools/rtoolsijcomref11943.dita (original)
+++ db/derby/docs/branches/10.3/src/tools/rtoolsijcomref11943.dita Mon Jul 2 01:29:49 2007
@@ -28,10 +28,9 @@
</refsyn>
<section><title>Description</title>
<p>Moves the cursor to after the last row, then fetches the row. (Since there
-is no current row, it returns the message: <codeph>No current row."</codeph></p>
+is no current row, it returns the message: <codeph>"No current row."</codeph></p>
<p>The cursor must have been created with the <xref href="rtoolsijcomref62772.dita#rtoolsijcomref62772">Get Scroll Insensitive Cursor</xref> command.
-<note>This command works only in a Java
-2 Platform, Standard Edition, v 1.2 (J2SE) or higher environment.</note></p>
+</p>
</section>
<example><title>Example</title>
<codeblock>ij> <b>get scroll insensitive cursor scrollCursor as
Modified: db/derby/docs/branches/10.3/src/tools/rtoolsijcomref44032.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/tools/rtoolsijcomref44032.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/tools/rtoolsijcomref44032.dita (original)
+++ db/derby/docs/branches/10.3/src/tools/rtoolsijcomref44032.dita Mon Jul 2 01:29:49 2007
@@ -29,8 +29,7 @@
<section><title>Description</title>
<p>Moves the cursor to the row previous to the current one, then fetches the
row. The cursor must have been created with the <xref href="rtoolsijcomref62772.dita#rtoolsijcomref62772">Get Scroll Insensitive Cursor</xref> command. It displays a banner and the values of the row.
-<note>This command works only in a Java 2 Platform, Standard Edition,
-v 1.2 (J2SE) or higher environment.</note></p>
+</p>
</section>
<example><title>Example</title>
<codeblock>ij> <b>get scroll insensitive cursor scrollCursor as
Modified: db/derby/docs/branches/10.3/src/tools/rtoolsijcomref53869.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/tools/rtoolsijcomref53869.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/tools/rtoolsijcomref53869.dita (original)
+++ db/derby/docs/branches/10.3/src/tools/rtoolsijcomref53869.dita Mon Jul 2 01:29:49 2007
@@ -29,8 +29,7 @@
<section><title>Description</title>
<p>Moves the cursor to the last row in the <i>ResultSet</i>,
then fetches the row. The cursor must have been created with the <xref href="rtoolsijcomref62772.dita#rtoolsijcomref62772">Get Scroll Insensitive Cursor</xref> command. It displays a banner and the values of the row.
-<note>This command works only in a Java 2 Platform, Standard Edition,
-v 1.2 (J2SE) or higher environment.</note></p>
+</p>
</section>
<example><title>Example</title>
<codeblock>ij> <b>get scroll insensitive cursor scrollCursor as
Modified: db/derby/docs/branches/10.3/src/tools/rtoolsijcomref61708.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/tools/rtoolsijcomref61708.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/tools/rtoolsijcomref61708.dita (original)
+++ db/derby/docs/branches/10.3/src/tools/rtoolsijcomref61708.dita Mon Jul 2 01:29:49 2007
@@ -29,8 +29,7 @@
<section><title>Description</title>
<p>Moves the cursor to the first row in the <i>ResultSet</i>,
then fetches the row. The cursor must have been created with the <xref href="rtoolsijcomref62772.dita#rtoolsijcomref62772">Get Scroll Insensitive Cursor</xref> command. It displays a banner and the values of the row.
-<note>This command works only in a Java 2 Platform, Standard Edition,
-v 1.2 (J2SE) or higher environment.</note></p>
+</p>
</section>
<example><title>Example</title>
<codeblock>ij> <b>get scroll insensitive cursor scrollCursor as
Modified: db/derby/docs/branches/10.3/src/tools/rtoolsijcomref62772.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/tools/rtoolsijcomref62772.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/tools/rtoolsijcomref62772.dita (original)
+++ db/derby/docs/branches/10.3/src/tools/rtoolsijcomref62772.dita Mon Jul 2 01:29:49 2007
@@ -36,8 +36,7 @@
<p>Creates a scrollable insensitive cursor with the name of the <i>Identifier</i>. (It does this by issuing a <i>createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY</i>) call and then executing the statement with <i>java.sql.StatementExecuteQuery</i> request on the value of
the String.)
-<note>This command only works in a Java 2 Platform,
-Standard Edition, v 1.2 (J2SE) or higher environment.</note></p>
+</p>
<p>If the <i>String</i> is a statement that does not generate
a result set, the behavior of the underlying database determines whether an
empty result set or an error is issued. If there is an error in executing
Modified: db/derby/docs/branches/10.3/src/tools/rtoolsijcomref79286.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/tools/rtoolsijcomref79286.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/tools/rtoolsijcomref79286.dita (original)
+++ db/derby/docs/branches/10.3/src/tools/rtoolsijcomref79286.dita Mon Jul 2 01:29:49 2007
@@ -30,8 +30,7 @@
<p>Moves the cursor to before the first row, then fetches the row. (Since
there is no current row, it returns the message <codeph>No current row</codeph>.)</p>
<p>The cursor must have been created with the <xref href="rtoolsijcomref62772.dita#rtoolsijcomref62772">Get Scroll Insensitive Cursor</xref> command.
-<note>This command works only in a Java
-2 Platform, Standard Edition, v 1.2 (J2SE) or higher environment.</note></p>
+</p>
</section>
<example><title>Example</title>
<codeblock>ij> <b>get scroll insensitive cursor scrollCursor as
Modified: db/derby/docs/branches/10.3/src/tools/rtoolsijcomref94092.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/tools/rtoolsijcomref94092.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/tools/rtoolsijcomref94092.dita (original)
+++ db/derby/docs/branches/10.3/src/tools/rtoolsijcomref94092.dita Mon Jul 2 01:29:49 2007
@@ -29,8 +29,7 @@
<section><title>Description</title>
<p>Moves the cursor to the row specified by the <i>int</i>,
then fetches the row. The cursor must have been created with the <xref href="rtoolsijcomref62772.dita#rtoolsijcomref62772">Get Scroll Insensitive Cursor</xref> command. It displays a banner and the values of the row.
-<note>This command works only in a Java 2 Platform, Standard Edition,
-v 1.2 (J2SE) or higher environment.</note></p>
+</p>
</section>
<example><title>Example</title>
<codeblock>ij> <b>autocommit off;</b>
Modified: db/derby/docs/branches/10.3/src/tools/rtoolsijcomref97975.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/tools/rtoolsijcomref97975.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/tools/rtoolsijcomref97975.dita (original)
+++ db/derby/docs/branches/10.3/src/tools/rtoolsijcomref97975.dita Mon Jul 2 01:29:49 2007
@@ -31,9 +31,7 @@
of rows relative to the current row, then fetches the row. The cursor must
have been created with the <xref href="rtoolsijcomref62772.dita#rtoolsijcomref62772">Get Scroll Insensitive Cursor</xref> command.
It displays a banner and the values of the row.
-<note>This command
-works only in a Java 2 Platform, Standard Edition, v 1.2 (J2SE) or higher
-environment.</note></p>
+</p>
</section>
<example><title>Example</title>
<codeblock>ij> -- autocommit needs to be off so that the positioned update
Modified: db/derby/docs/branches/10.3/src/tools/rtoolsijpropref97949.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/tools/rtoolsijpropref97949.dita?view=diff&rev=552431&r1=552430&r2=552431
==============================================================================
--- db/derby/docs/branches/10.3/src/tools/rtoolsijpropref97949.dita (original)
+++ db/derby/docs/branches/10.3/src/tools/rtoolsijpropref97949.dita Mon Jul 2 01:29:49 2007
@@ -40,7 +40,7 @@
-Dij.protocol=jdbc:derby:
org.apache.derby.tools.ij</b></codeblock>
<p>The following table contains a sampling of character encodings supported
-by the IBM Application Developer Kit. To see the full list, go to <i><xref scope="local" format="html" href="http://java.sun.com/j2se/1.3/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.3/docs/guide/intl/encoding.doc.html</xref></i>.
+by the IBM Application Developer Kit. To see the full list, go to <i><xref scope="local" format="html" href="http://java.sun.com/j2se/1.4.2/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.4.2/docs/guide/intl/encoding.doc.html</xref></i>.
<table id="rtoolsijpropref62163" pgwide="0" frame="all">
<title>Sample Character Encodings</title>
<tgroup cols="2" colsep="1" rowsep="1">