db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpendle...@apache.org
Subject svn commit: r882792 - /db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita
Date Fri, 20 Nov 2009 23:47:23 GMT
Author: bpendleton
Date: Fri Nov 20 23:47:22 2009
New Revision: 882792

URL: http://svn.apache.org/viewvc?rev=882792&view=rev
Log:
DERBY-1194: Clarify wording for ways to manage the Network Server

This suggestion was contributed by Halley Pacheco de Oliveira (halleypo at gmail dot com).

This patch clarifies the description in the Derby Server and Administration
Guide regarding the different configurations of the Derby Network Server,
and how the server can be managed. Links are provided to additional
information in the Network Server section of the Derby Tutorial.

Modified:
    db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita

Modified: db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita?rev=882792&r1=882791&r2=882792&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita Fri Nov 20 23:47:22 2009
@@ -20,8 +20,21 @@
 <concept id="cadminconfig86869" xml:lang="en-us">
 <title>Managing the Derby Network Server</title>
 <shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph>
Network
-Server can run as a stand-alone server, with <ph conref="../conrefs.dita#prod/productshortname"></ph>
as
-an embedded part of the application. </shortdesc>
+    Server can be run in either of these configurations:
+    <ul>
+        <li>As <xref format="html" scope="external"
+                href="http://db.apache.org/derby/papers/DerbyTut/ns_intro.html#ns_intro">a
stand-alone server</xref>,
+            in which case it is an independent Java process embedding the 
+            <ph conref="../conrefs.dita#prod/productshortname"></ph> 
+            database engine</li>
+        <li>As <xref format="html" scope="external"
+                href="http://db.apache.org/derby/papers/DerbyTut/ns_intro.html#Embedded+Server">an
embedded server</xref>,
+            in which case it is embedded within another Java application,
+            and both the Network Server framework and the 
+            <ph conref="../conrefs.dita#prod/productshortname"></ph> 
+            database engine are loaded by the Java application</li>
+    </ul>
+</shortdesc>
 <prolog></prolog>
 <conbody>
 <p>You can use Java Management Extensions (JMX) technology to monitor and manage
@@ -35,9 +48,12 @@
 <xref format="html" href="http://java.sun.com/javase/technologies/core/mntr-mgmt/javamanagement/"
 scope="external">http://java.sun.com/javase/technologies/core/mntr-mgmt/javamanagement/</xref>.
 </p>
-<p>The Network Server can also be managed remotely from a web server by using a servlet
interface.
+<p>
 You can manage the Network Server by using shell scripts, the command line,
-or the Network Server API. See <xref href="cadminservlet98430.dita#cadminservlet98430"></xref>
for
+or the Network Server API.
+    The Network Server can also be managed remotely from a web server by
+    using a servlet interface.
+See <xref href="cadminservlet98430.dita#cadminservlet98430"></xref> for
 information about starting and shutting down the Network Server using the
 servlet interface.</p>
 </conbody>



Mime
View raw message