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 rh...@apache.org on 2018/11/25 16:32:58 UTC
svn commit: r1847420 - in /db/derby/docs/trunk/src/adminguide:
cadminappsclientdiffs.dita tadminappschangingyourclasspath.dita
tadmincbdjhhfd.dita tadminovclirun.dita tadminovrunsrvprgm.dita
Author: rhillegas
Date: Sun Nov 25 16:32:57 2018
New Revision: 1847420
URL: http://svn.apache.org/viewvc?rev=1847420&view=rev
Log:
DERBY-6980: Admin Guide changes related to modularization; commit derby-6980-11-aa-adminGuide.diff.
Modified:
db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita
db/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita
db/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita
db/derby/docs/trunk/src/adminguide/tadminovclirun.dita
db/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita
Modified: db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita?rev=1847420&r1=1847419&r2=1847420&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita Sun Nov 25 16:32:57 2018
@@ -41,8 +41,6 @@ driver, processing stops when an error i
driver, processing continues, but an appropriate value as defined in the
<codeph>java.sql.Statement</codeph> API is returned in the resulting update
count array.</li>
-<li>To use an encrypted user id and password, you need to have the IBM's Java
-Cryptography Extension (JCE) Version 1.2.1 or later.</li>
</ul></p>
</conbody>
</concept>
Modified: db/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita?rev=1847420&r1=1847419&r2=1847420&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita Sun Nov 25 16:32:57 2018
@@ -34,10 +34,21 @@ following jar file to your server classp
<ph conref="../conrefs.dita#prod/productshortname"></ph> classes. These classes are in the following jar files, which you can also add
to your classpath/modulepath separately:</p>
</context>
+
<steps-unordered>
-<step><cmd><codeph>derbynet.jar</codeph></cmd><info><p>This jar file contains
+
+<step><cmd><codeph>derbyshared.jar</codeph></cmd>
+<info><p>This jar file contains
+code which is common to all <ph conref="../conrefs.dita#prod/productshortname"></ph>
+configurations.</p></info>
+</step>
+
+<step><cmd><codeph>derbynet.jar</codeph></cmd>
+<info><p>This jar file contains
the Network Server code. It must be in your classpath/modulepath to start the Network
-Server.</p></info></step>
+Server.</p></info>
+</step>
+
<step><cmd><codeph>derby.jar</codeph></cmd>
<info><p>This jar file contains the
<ph conref="../conrefs.dita#prod/productshortname"></ph> database engine code.
@@ -48,6 +59,7 @@ attribute of <codeph>derbynet.jar</codep
<codeph>derbynet.jar</codeph> in the classpath/modulepath and <codeph>derby.jar</codeph> is
in the same directory as <codeph>derbynet.jar</codeph>, it is not necessary to
include <codeph>derby.jar</codeph> explicitly.</p></info></step>
+
<step><cmd><codeph>derbyclient.jar</codeph></cmd>
<info><p>This jar file contains the
<ph conref="../conrefs.dita#prod/productshortname"></ph> Network Client JDBC
@@ -56,18 +68,22 @@ in the classpath/modulepath of the appli
<ph conref="../conrefs.dita#prod/productshortname"></ph> databases over a
network.</p></info>
</step>
+
<step><cmd><codeph>derbytools.jar</codeph></cmd><info><p>This jar file
contains the standard <ph conref="../conrefs.dita#prod/productshortname"></ph>
tools, such as <codeph>ij</codeph>, <codeph>sysinfo</codeph>,
and <codeph>dblook</codeph>.
This jar file also contains the <ph conref="../conrefs.dita#prod/productshortname"></ph> DataSources.</p></info></step>
+
<step><cmd><codeph>derbyoptionaltools.jar</codeph></cmd><info><p>This jar file
contains additional <ph conref="../conrefs.dita#prod/productshortname"></ph>
tools, such as the Lucene plug-in.
The <codeph>derbyoptionaltools.jar</codeph> file is not needed in
your classpath/modulepath to run the Network Server, but it is automatically included
by <codeph>derbyrun.jar</codeph>.</p></info></step>
+
</steps-unordered>
+
<example><p>All of the jar files are in the
<codeph>$<ph conref="../conrefs.dita#prod/productinstallpath"></ph>/lib</codeph>
directory.</p>
Modified: db/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita?rev=1847420&r1=1847419&r2=1847420&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita Sun Nov 25 16:32:57 2018
@@ -40,7 +40,8 @@ the <ph conref="../conrefs.dita#pub/cits
For details on how to do this, see "Configuring Java security," also in
the <ph conref="../conrefs.dita#pub/citsec"></ph>. By default a security manager will be installed with a default security policy when a Network Server is started. This default policy file is called <codeph>server.policy</codeph> and is part of
<codeph>derbynet.jar</codeph>.
-There is also a <codeph>template.policy</codeph> file in <codeph>derbynet.jar</codeph> which can be used as starting point for a customized server policy file. For more information about policy files, granting permissions, and property
+There is also a <codeph>serverTemplate.policy</codeph> file in the <codeph>demo/templates</codeph> directory of the distribution.
+It can be used as a starting point for customizing a server policy. For more information about policy files, granting permissions, and property
expansion, see "Default Policy Implementation and Policy File Syntax" at
<xref format="html"
href="http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html"
@@ -155,10 +156,10 @@ Set your classpath/modulepath to include
<ph conref="../conrefs.dita#prod/productshortname"></ph>
jar files. Then use a <codeph>java</codeph> command to invoke the
<codeph>NetworkServerControl</codeph> class directly, as shown in the following
-table.</p>
+tables.</p>
<table>
-<title>Commands to invoke the <codeph>NetworkServerControl</codeph> class</title>
-<desc>This table lists the commands to invoke the <codeph>NetworkServerControl</codeph> class on UNIX and Windows systems.</desc>
+<title>Commands to invoke the <codeph>NetworkServerControl</codeph> class via the classpath</title>
+<desc>This table lists the commands to invoke the <codeph>NetworkServerControl</codeph> class via the classpath on UNIX and Windows systems.</desc>
<tgroup cols="2" colsep="1" rowsep="1">
<colspec colname="col1" colnum="1" colwidth="25*"/>
<colspec colname="col2" colnum="2" colwidth="75*"/>
@@ -181,6 +182,35 @@ table.</p>
</row>
</tbody>
</tgroup>
+</table>
+
+<table>
+<title>Commands to invoke the <codeph>NetworkServerControl</codeph> class via the modulepath</title>
+<desc>This table lists the commands to invoke the <codeph>NetworkServerControl</codeph> class via the modulepath on UNIX and Windows systems.</desc>
+<tgroup cols="2" colsep="1" rowsep="1">
+<colspec colname="col1" colnum="1" colwidth="25*"/>
+<colspec colname="col2" colnum="2" colwidth="75*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Operating System</entry>
+<entry colname="col2">Command</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">Windows</entry>
+<entry colname="col2"><codeblock><b><userinput>%DERBY_HOME%\bin\setNetworkServerCP</userinput></b>
+<b><userinput>java -p %MODULEPATH% ^
+ -m org.apache.derby.server/org.apache.derby.drda.NetworkServerControl start</userinput></b></codeblock></entry>
+</row>
+<row>
+<entry colname="col1">UNIX (Korn Shell)</entry>
+<entry colname="col2"><codeblock><b><userinput>$DERBY_HOME/bin/setNetworkServerCP</userinput></b>
+<b><userinput>java -p $MODULEPATH \
+ -m org.apache.derby.server/org.apache.derby.drda.NetworkServerControl start</userinput></b></codeblock></entry>
+</row>
+</tbody>
+</tgroup>
</table>
</li>
</ul>
Modified: db/derby/docs/trunk/src/adminguide/tadminovclirun.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadminovclirun.dita?rev=1847420&r1=1847419&r2=1847420&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadminovclirun.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadminovclirun.dita Sun Nov 25 16:32:57 2018
@@ -35,6 +35,7 @@ is the directory where you installed
<info><ul>
<li>The current directory (".")</li>
<li><codeph>derbyclient.jar</codeph></li>
+<li><codeph>derbyshared.jar</codeph></li>
</ul></info></step>
<step><cmd>After you set up your environment correctly, run the
<codeph>SimpleNetworkClientSample</codeph> program from the same
Modified: db/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita?rev=1847420&r1=1847419&r2=1847420&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita Sun Nov 25 16:32:57 2018
@@ -32,14 +32,32 @@ is the directory where you installed
</step>
<step><cmd>Set the classpath to include the current directory (".") and the
following jar files:</cmd>
-<info><dl><dlentry>
+<info>
+
+<dl>
+
+<dlentry>
<dt><codeph>derbynet.jar</codeph></dt>
<dd>The Network Server jar file. It must be in your CLASSPATH because you start
the Network Server in this program.</dd>
-</dlentry><dlentry>
+</dlentry>
+
+<dlentry>
<dt><codeph>derby.jar</codeph></dt>
<dd>The database engine jar file.</dd>
-</dlentry></dl></info></step>
+</dlentry>
+
+<dlentry>
+<dt><codeph>derbtools.jar</codeph></dt>
+<dd>DataSources.</dd>
+</dlentry>
+
+<dlentry>
+<dt><codeph>derbyshared.jar</codeph></dt>
+<dd>Common utility methods.</dd>
+</dlentry>
+
+</dl></info></step>
<step><cmd>Test the CLASSPATH settings by running the following Java
command:</cmd>
<stepxmp>