db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1844197 - in /db/derby/code/trunk: ./ java/org.apache.derby.client/ java/org.apache.derby.commons/ java/org.apache.derby.engine/ java/org.apache.derby.optionaltools/ java/org.apache.derby.runner/ java/org.apache.derby.server/ java/org.apac...
Date Thu, 18 Oct 2018 03:36:02 GMT
Author: rhillegas
Date: Thu Oct 18 03:36:02 2018
New Revision: 1844197

URL: http://svn.apache.org/viewvc?rev=1844197&view=rev
Log:
DERBY-6980: Add module diagrams to the Derby javadoc; commit derby-6980-01-aa-moduleDiagramsInJavadoc.diff.

Added:
    db/derby/code/trunk/tools/javadoc/moduleDiagrams/
    db/derby/code/trunk/tools/javadoc/moduleDiagrams/client.svg   (with props)
    db/derby/code/trunk/tools/javadoc/moduleDiagrams/commons.svg   (with props)
    db/derby/code/trunk/tools/javadoc/moduleDiagrams/engine.svg   (with props)
    db/derby/code/trunk/tools/javadoc/moduleDiagrams/optionaltools.svg   (with props)
    db/derby/code/trunk/tools/javadoc/moduleDiagrams/runner.svg   (with props)
    db/derby/code/trunk/tools/javadoc/moduleDiagrams/server.svg   (with props)
    db/derby/code/trunk/tools/javadoc/moduleDiagrams/tests.svg   (with props)
    db/derby/code/trunk/tools/javadoc/moduleDiagrams/tools.svg   (with props)
Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/org.apache.derby.client/module-info.java
    db/derby/code/trunk/java/org.apache.derby.commons/module-info.java
    db/derby/code/trunk/java/org.apache.derby.engine/module-info.java
    db/derby/code/trunk/java/org.apache.derby.optionaltools/module-info.java
    db/derby/code/trunk/java/org.apache.derby.runner/module-info.java
    db/derby/code/trunk/java/org.apache.derby.server/module-info.java
    db/derby/code/trunk/java/org.apache.derby.tests/module-info.java
    db/derby/code/trunk/java/org.apache.derby.tools/module-info.java
    db/derby/code/trunk/published_api_overview.html

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1844197&r1=1844196&r2=1844197&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Thu Oct 18 03:36:02 2018
@@ -1099,6 +1099,11 @@
     <copy file="${javadoctools.dir}/logo/derby_logo64.png" 
           todir="${public.api.dir}/resources"/>     
 
+    <!-- Copy the module diagrams used by the overview -->
+    <copy todir="${public.api.dir}/resources">
+      <fileset dir="${javadoctools.dir}/moduleDiagrams"/>
+    </copy>
+
   </target>
 
 
@@ -1129,6 +1134,11 @@
       <arg value="--module"/><arg value="${module.name.commons},${module.name.engine},${module.name.client},${module.name.server},${module.name.tools},${module.name.optionaltools},${module.name.runner},${module.name.tests}"/>
     </exec>
 
+    <!-- Copy the module diagrams used by the module overviews -->
+    <copy todir="${out.javadoc.dir}/engine/resources">
+      <fileset dir="${javadoctools.dir}/moduleDiagrams"/>
+    </copy>
+
   </target>
 
   <target name="toolsdocs">

Modified: db/derby/code/trunk/java/org.apache.derby.client/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.client/module-info.java?rev=1844197&r1=1844196&r2=1844197&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.client/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.client/module-info.java Thu Oct 18 03:36:02 2018
@@ -19,6 +19,33 @@
 
  */
 
+/**
+ * <p>
+ * Applications running on remote machines access Derby databases via a
+ * remote client configuration. In its smallest footprint, remote
+ * JDBC connections are created via
+ * <i>java.sql.DriverManager.getConnection()</i>.
+ * Other, optional modules further expand the functionality:
+ * </p>
+ * 
+ * <ul>
+ *  <li><b><font color="gray">org.apache.derby.tools</font></b> - This module lets the application access Derby via
+ *   <i>javax.sql.DataSource</i>s.</li>
+ *  <li><b><font color="gray">java.naming</font></b> - This
+ *  module supports JNDI lookup of DataSources.</li>
+ * </ul>
+ * 
+ * <p><b>Module Diagram:</b</p>
+ *
+ * <div style="text-align:center;">
+ *   <img
+ *     src="resources/client.svg"
+ *     alt="module diagram for org.apache.derby.client"
+ *     border="2"
+ *   />
+ * </div>
+ *
+ */
 module org.apache.derby.client
 {
     //

Modified: db/derby/code/trunk/java/org.apache.derby.commons/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/module-info.java?rev=1844197&r1=1844196&r2=1844197&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/module-info.java Thu Oct 18 03:36:02 2018
@@ -19,6 +19,22 @@
 
  */
 
+/**
+ * <p>
+ * All configurations need this utility module.
+ * </p>
+ * 
+ * <p><b>Module Diagram:</b</p>
+ *
+ * <div style="text-align:center;">
+ *   <img
+ *     src="resources/commons.svg"
+ *     alt="module diagram for org.apache.derby.commons"
+ *     border="2"
+ *   />
+ * </div>
+ *
+ */
 module org.apache.derby.commons
 {
     //

Modified: db/derby/code/trunk/java/org.apache.derby.engine/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/module-info.java?rev=1844197&r1=1844196&r2=1844197&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/module-info.java Thu Oct 18 03:36:02 2018
@@ -19,6 +19,42 @@
 
  */
 
+/**
+ * <p>
+ * The smallest footprint, core Derby configuration consists of the embedded engine. In
+ * this configuration, Derby is a complete, secure, transactional,
+ * recoverable data manager which runs in the same JVM as the user's
+ * application. This configuration includes an embedded JDBC driver,
+ * accessed via <i>java.sql.DriverManager.getConnection()</i>. More
+ * functionality can be enabled by adding other, optional modules to this configuration:
+ * </p>
+ * 
+ * <ul>
+ *  <li><b><font color="gray">org.apache.derby.tools</font></b> - This module lets the application access Derby via
+ *   <i>javax.sql.DataSource</i>s.</li>
+ *  <li><b><font color="gray">org.apache.derby.locale_*</font></b> - These
+ *  modules let Derby translate diagnostic messages into
+ *  languages other than English.</li>
+ *  <li><b><font color="gray">org.osgi.framework</font></b> - This
+ *  module lets Derby load as an OSGI component. The user must
+ *  supply an OSGI implementation in a module named <b><font color="gray">org.osgi.framework</font></b>.</li>
+ *  <li><b><font color="gray">java.management</font></b> - This
+ *  module lets JMX MBeans introspect the Derby engine.</li>
+ *  <li><b><font color="gray">java.naming</font></b> - This
+ *  module supports JNDI lookup of DataSources and LDAP authenticators.</li>
+ * </ul>
+ *
+ * <p><b>Module Diagram:</b</p>
+ *
+ * <div style="text-align:center;">
+ *   <img
+ *     src="resources/engine.svg"
+ *     alt="module diagram for org.apache.derby.engine"
+ *     border="2"
+ *   />
+ * </div>
+ *
+ */
 module org.apache.derby.engine
 {
     //

Modified: db/derby/code/trunk/java/org.apache.derby.optionaltools/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/module-info.java?rev=1844197&r1=1844196&r2=1844197&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/module-info.java Thu Oct 18 03:36:02 2018
@@ -19,6 +19,44 @@
 
  */
 
+/**
+ * <p>
+ * An extra set of tools supports metadata introspection, access to other
+ * vendors' databases, full-text search, and the importing of
+ * JSON-formatted data. Optional functionality includes:
+ * </p>
+ * 
+ * <ul>
+ *  <li><b><font color="gray">json.simple</font></b> - To import
+ *  JSON-formatted data, include the <i>JSON.simple</i> jar file available from
+ *   <a href="https://code.google.com/archive/p/json-simple/">https://code.google.com/archive/p/json-simple/</a>.</li>
+ *  <li><b><font color="gray">lucene.core, lucene.queryparser, lucene.analyzers.common</font></b> - To run full-text
+ *  searches, include the <i>lucene-core-4.5.0.jar</i>,
+ *  <i>lucene-queryparser-4.5.0.jar</i>, and <i>lucene-analyzers-common-4.5.0.jar</i>
+ *   modules available from the
+ *   <a href="https://lucene.apache.org/">Apache Lucene project</a>.</li>
+ *  <li><b><font color="gray">org.apache.derby.locale_*</font></b> - Include
+ *  these modules for non-English diagnostic messages.</li>
+ *  <li><b><font color="gray">org.osgi.framework</font></b> - See the
+ *  header comment on the engine module.</li>
+ *  <li><b><font color="gray">java.management</font></b> - See the
+ *  header comment on the engine module.</li>
+ *  <li><b><font color="gray">java.naming</font></b> - This
+ *  module supports JNDI lookup of LDAP authenticators when running with
+ *  the embedded driver.</li>
+ * </ul>
+ * 
+ * <p><b>Module Diagram:</b</p>
+ *
+ * <div style="text-align:center;">
+ *   <img
+ *     src="resources/optionaltools.svg"
+ *     alt="module diagram for org.apache.derby.optionaltools"
+ *     border="2"
+ *   />
+ * </div>
+ *
+ */
 module org.apache.derby.optionaltools
 {
     //

Modified: db/derby/code/trunk/java/org.apache.derby.runner/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.runner/module-info.java?rev=1844197&r1=1844196&r2=1844197&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.runner/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.runner/module-info.java Thu Oct 18 03:36:02 2018
@@ -19,6 +19,30 @@
 
  */
 
+/**
+ * <p>
+ * This convenience module makes it easy to run several tools and to
+ * administer the network server. Optional functionality includes:
+ * </p>
+ * 
+ * <ul>
+ *  <li><b><font color="gray">org.apache.derby.locale_*</font></b> - Include
+ *  these modules for non-English diagnostic messages.</li>
+ *  <li><b><font color="gray">java.naming</font></b> - This
+ *  module supports JNDI lookup of LDAP authenticators.</li>
+ * </ul>
+ * 
+ * <p><b>Module Diagram:</b</p>
+ *
+ * <div style="text-align:center;">
+ *   <img
+ *     src="resources/runner.svg"
+ *     alt="module diagram for org.apache.derby.runner"
+ *     border="2"
+ *   />
+ * </div>
+ *
+ */
 module org.apache.derby.runner
 {
     //

Modified: db/derby/code/trunk/java/org.apache.derby.server/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/module-info.java?rev=1844197&r1=1844196&r2=1844197&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/module-info.java Thu Oct 18 03:36:02 2018
@@ -19,6 +19,25 @@
 
  */
 
+/**
+ * <p>
+ * The Derby network server wraps the engine in a DRDA protocol
+ * driver. In this configuration, clients on remote machines can access
+ * Derby databases. The optional engine modules can be added to this
+ * configuration to provide their extra functionality.
+ * </p>
+ * 
+ * <p><b>Module Diagram:</b</p>
+ *
+ * <div style="text-align:center;">
+ *   <img
+ *     src="resources/server.svg"
+ *     alt="module diagram for org.apache.derby.server"
+ *     border="2"
+ *   />
+ * </div>
+ *
+ */
 module org.apache.derby.server
 {
     //

Modified: db/derby/code/trunk/java/org.apache.derby.tests/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/module-info.java?rev=1844197&r1=1844196&r2=1844197&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/module-info.java Thu Oct 18 03:36:02 2018
@@ -19,6 +19,22 @@
 
  */
 
+/**
+ * <p>
+ * The Derby tests exercise all of the modules.
+ * </p>
+ * 
+ * <p><b>Module Diagram:</b</p>
+ *
+ * <div style="text-align:center;">
+ *   <img
+ *     src="resources/tests.svg"
+ *     alt="module diagram for org.apache.derby.tests"
+ *     border="2"
+ *   />
+ * </div>
+ *
+ */
 open module org.apache.derby.tests
 {
     //

Modified: db/derby/code/trunk/java/org.apache.derby.tools/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tools/module-info.java?rev=1844197&r1=1844196&r2=1844197&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tools/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tools/module-info.java Thu Oct 18 03:36:02 2018
@@ -19,6 +19,40 @@
 
  */
 
+/**
+ * <p>
+ * A set of basic tools (including an interactive SQL monitor) can access
+ * Derby databases via either the embedded or remote client
+ * drivers. Optional functionality includes:
+ * </p>
+ * 
+ * <ul>
+ *  <li><b><font color="gray">org.apache.derby.engine</font></b> -
+ *  Include this module for embedded access.</li>
+ *  <li><b><font color="gray">org.apache.derby.client</font></b> -
+ *  Include this module for remote access.</li>
+ *  <li><b><font color="gray">org.apache.derby.locale_*</font></b> - Include
+ *  these modules for non-English diagnostic messages.</li>
+ *  <li><b><font color="gray">org.osgi.framework</font></b> - See the
+ *  header comment on the engine module.</li>
+ *  <li><b><font color="gray">java.management</font></b> - See the
+ *  header comment on the engine module.</li>
+ *  <li><b><font color="gray">java.naming</font></b> - This
+ *  module supports JNDI lookup of LDAP authenticators when running with
+ *  the embedded driver.</li>
+ * </ul>
+ * 
+ * <p><b>Module Diagram:</b</p>
+ *
+ * <div style="text-align:center;">
+ *   <img
+ *     src="resources/tools.svg"
+ *     alt="module diagram for org.apache.derby.tools"
+ *     border="2"
+ *   />
+ * </div>
+ *
+ */
 module org.apache.derby.tools
 {
     //

Modified: db/derby/code/trunk/published_api_overview.html
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/published_api_overview.html?rev=1844197&r1=1844196&r2=1844197&view=diff
==============================================================================
--- db/derby/code/trunk/published_api_overview.html (original)
+++ db/derby/code/trunk/published_api_overview.html Thu Oct 18 03:36:02 2018
@@ -14,31 +14,125 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
 <body>
-Apache Derby is a pure Java, standards-based relational database engine.
-Derby provides an easy to use data management solution for
-software developers with zero administration for end users.
+
+<h2>Summary</h2>
+
+<p>
+Apache Derby is a standards-based, pure-Java relational database engine.
+Its easy-to-use data manager requires no administration by end users.
+Derby runs on any JVM at Java version 9 or higher and Derby supports JDBC
+  version 4.3.
+Derby's platform-independent database format may be copied to
+any file system.
+</p>
+
 <p>
-Derby runs on any Java SE 6 platform or higher with 4.0, 4.1, and 4.2.
-For Java 8, Derby can also run on constrained devices
-with a runtime as specified by OpenJDK JEP 161, i.e. Compact Profile 2
-or higher.
+Apache Derby is a subproject of the Apache DB project,
+licensed under the Apache License, Version 2.0, which you may obtain
+from <a href="https://www.apache.org/licenses/LICENSE-2.0">https://www.apache.org/licenses/LICENSE-2.0</a>
+You may find Derby on the web at <a href="https://db.apache.org/derby/">https://db.apache.org/derby/</a>.
+You may download Apache Derby releases from <a href="https://db.apache.org/derby/derby_downloads.html">https://db.apache.org/derby/derby_downloads.html</a>.
 </p>
-Derby's database format is platform independent allowing databases to be copied to
-any machine type.
-<P>
-Apache Derby is a subproject of the Apache DB project, and is
-licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License. You may obtain a copy of the License at:
-<BR>
-<a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>
-
-<P>
-You can find Derby on the web at:
-<BR>
- <a href="http://db.apache.org/derby/">http://db.apache.org/derby/</a>
-
-<P>
-Apache Derby releases can be downloaded from the following page:
-<BR>
-<a href="http://db.apache.org/derby/derby_downloads.html">http://db.apache.org/derby/derby_downloads.html</a>
+
+<p>
+Information on Derby configurations follows.
+</p>
+
+<h2>Derby Configurations</h2>
+
+<p>
+Derby's modules may be wired together in several configurations. The
+modules are:
+</p>
+
+<table border="1">
+  <thead>
+    <tr>
+     <th>Module name</th>
+     <th>Jar file</th>
+     <th>Description</th>
+    </tr>
+  </thead>
+
+  <tbody>
+
+    <tr>
+      <td>org.apache.derby.engine</td>
+      <td>derby.jar</td>
+      <td>The embedded database engine contains Derby's core
+      functionality. It contains its own JDBC driver, allowing
+      one JVM to host both Derby and the applications which use it.</td>
+    </tr>
+    
+    <tr>
+      <td>org.apache.derby.server</td>
+      <td>derbynet.jar</td>
+      <td>The network server wraps the database engine, enabling
+      networked JDBC access.</td>
+    </tr>
+    
+    <tr>
+      <td>org.apache.derby.client</td>
+      <td>derbyclient.jar</td>
+      <td>The remote JDBC client connects to a server across a
+      network.</td>
+    </tr>
+    
+    <tr>
+      <td>org.apache.derby.tools</td>
+      <td>derbytools.jar</td>
+      <td>Basic tools include a schema dumper and an interactive SQL interpreter.</td>
+    </tr>
+    
+    <tr>
+      <td>org.apache.derby.optionaltools</td>
+      <td>derbyoptionaltools.jar</td>
+      <td>Optional tools support metadata introspection and access to
+      other vendors' databases.</td>
+    </tr>
+    
+    <tr>
+      <td>org.apache.derby.runner</td>
+      <td>derbyrun.jar</td>
+      <td>The runner module supports easy command-line administration
+      of Derby installations.</td>
+    </tr>
+    
+    <tr>
+      <td>org.apache.derby.commons</td>
+      <td>derbyshared.jar</td>
+      <td>The commons module contains cross-module support utilities.</td>
+    </tr>
+    
+    <tr>
+      <td>org.apache.derby.locale_*</td>
+      <td>derbyLocale_*.jar</td>
+      <td>Message localizations support human-readable diagnostics
+      in languages other than English.</td>
+    </tr>
+    
+    <tr>
+      <td>org.apache.derby.tests</td>
+      <td>derbyTests.jar</td>
+      <td>An extensive body of tests stresses functionality in all of
+      the other modules.</td>
+    </tr>
+    
+  </tbody>
+  
+</table>
+
+<p>
+The following conventions apply to the module diagrams presented here:
+</p>
+
+<ul>
+<li>Derby modules appear in <b><font color="blue">blue</font></b>.</li>
+<li>JVM modules appear in <b><font color="black">black</font></b>.</li>
+<li>3rd party modules appear in <b><font color="pink">pink</font></b>.</li>
+<li>Optional modules appear in <b><font color="gray">gray</font></b>.</li>
+</ul>
+
 </body>

Added: db/derby/code/trunk/tools/javadoc/moduleDiagrams/client.svg
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/moduleDiagrams/client.svg?rev=1844197&view=auto
==============================================================================
--- db/derby/code/trunk/tools/javadoc/moduleDiagrams/client.svg (added)
+++ db/derby/code/trunk/tools/javadoc/moduleDiagrams/client.svg Thu Oct 18 03:36:02 2018
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  version="1.1" 
+  width="950"
+  height="500"
+  font-size="20px"
+>
+
+<title>Module Diagram for org.apache.derby.client</title>
+
+<desc>
+This diagram shows how org.apache.derby.client depends on other
+modules supplied by Derby, the JVM, and third-parties. To improve
+readability, direct dependencies are omitted when they can be
+deduced by walking the graph.
+</desc>
+
+<style>
+  text.jdk { stroke:black; text-anchor:middle }
+  text.thirdParty { stroke:pink; text-anchor:middle }
+  text.optional { font:italic; stroke:gray; text-anchor:middle }
+  text.derby { stroke:blue; text-anchor:middle }
+
+  line { stroke-width:1; stroke:black; marker-end:url(#arrowhead)}
+</style>
+
+<defs>
+    <marker
+      id="arrowhead"
+      markerWidth="10"
+      markerHeight="7" 
+      refX="0"
+      refY="3.5"
+      orient="auto"
+    >
+      <polygon points="0 0, 10 3.5, 0 7" />
+    </marker>
+</defs>
+
+<!-- Derby Modules -->
+
+<text x="540" y="180" class="optional">org.apache.derby.tools</text>
+<text x="540" y="240" class="derby">org.apache.derby.client</text>
+
+<text x="690" y="300" class="derby">org.apache.derby.commons</text>
+
+<!-- 3rd Party Modules -->
+
+<!-- JDK Modules -->
+
+<text x="690" y="360" class="jdk">java.sql</text>
+
+<text x="400" y="420" class="optional">java.naming</text>
+<text x="530" y="420" class="jdk">java.logging</text>
+<text x="690" y="420" class="jdk">java.transaction.xa</text>
+<text x="840" y="420" class="jdk">java.xml</text>
+
+<text x="500" y="480" class="jdk">java.base</text>
+
+<!-- Arcs from org.apache.derby.tools -->
+
+<line x1="540" y1="190" x2="540" y2="210" /> <!-- to org.apache.derby.client -->
+
+<!-- Arcs from org.apache.derby.client -->
+
+<line x1="450" y1="250" x2="450" y2="390" /> <!-- to java.naming -->
+<line x1="630" y1="250" x2="630" y2="270" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.commons -->
+
+<line x1="690" y1="310" x2="690" y2="330" /> <!-- to java.sql -->
+
+<!-- Arcs from java.sql -->
+
+<line x1="650" y1="370" x2="600" y2="395" /> <!-- to java.logging -->
+<line x1="690" y1="370" x2="690" y2="390" /> <!-- to java.transaction.xa -->
+<line x1="730" y1="370" x2="780" y2="395" /> <!-- to java.xml -->
+
+<!-- Arcs from other JDK modules to java.base  -->
+
+<line x1="400" y1="430" x2="440" y2="460" /> <!-- from java.naming -->
+<line x1="500" y1="430" x2="500" y2="450" /> <!-- from java.logging -->
+<line x1="620" y1="430" x2="560" y2="460" /> <!-- from java.transaction.xa -->
+<line x1="840" y1="430" x2="560" y2="480" /> <!-- from java.xml -->
+
+</svg>

Propchange: db/derby/code/trunk/tools/javadoc/moduleDiagrams/client.svg
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/tools/javadoc/moduleDiagrams/commons.svg
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/moduleDiagrams/commons.svg?rev=1844197&view=auto
==============================================================================
--- db/derby/code/trunk/tools/javadoc/moduleDiagrams/commons.svg (added)
+++ db/derby/code/trunk/tools/javadoc/moduleDiagrams/commons.svg Thu Oct 18 03:36:02 2018
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  version="1.1" 
+  width="950"
+  height="500"
+  font-size="20px"
+>
+
+<title>Module Diagram for org.apache.derby.commons</title>
+
+<desc>
+This diagram shows how org.apache.derby.commons depends on other
+modules supplied by Derby, the JVM, and third-parties. To improve
+readability, direct dependencies are omitted when they can be
+deduced by walking the graph.
+</desc>
+
+<style>
+  text.jdk { stroke:black; text-anchor:middle }
+  text.thirdParty { stroke:pink; text-anchor:middle }
+  text.optional { font:italic; stroke:gray; text-anchor:middle }
+  text.derby { stroke:blue; text-anchor:middle }
+
+  line { stroke-width:1; stroke:black; marker-end:url(#arrowhead)}
+</style>
+
+<defs>
+    <marker
+      id="arrowhead"
+      markerWidth="10"
+      markerHeight="7" 
+      refX="0"
+      refY="3.5"
+      orient="auto"
+    >
+      <polygon points="0 0, 10 3.5, 0 7" />
+    </marker>
+</defs>
+
+<!-- Derby Modules -->
+
+<text x="690" y="300" class="derby">org.apache.derby.commons</text>
+
+<!-- JDK Modules -->
+
+<text x="690" y="360" class="jdk">java.sql</text>
+
+<text x="530" y="420" class="jdk">java.logging</text>
+<text x="690" y="420" class="jdk">java.transaction.xa</text>
+<text x="840" y="420" class="jdk">java.xml</text>
+
+<text x="500" y="480" class="jdk">java.base</text>
+
+<!-- Arcs from org.apache.derby.commons -->
+
+<line x1="690" y1="310" x2="690" y2="330" /> <!-- to java.sql -->
+
+<!-- Arcs from java.sql -->
+
+<line x1="650" y1="370" x2="600" y2="395" /> <!-- to java.logging -->
+<line x1="690" y1="370" x2="690" y2="390" /> <!-- to java.transaction.xa -->
+<line x1="730" y1="370" x2="780" y2="395" /> <!-- to java.xml -->
+
+<!-- Arcs from other JDK modules to java.base  -->
+
+<line x1="500" y1="430" x2="500" y2="450" /> <!-- from java.logging -->
+<line x1="620" y1="430" x2="560" y2="460" /> <!-- from java.transaction.xa -->
+<line x1="840" y1="430" x2="560" y2="480" /> <!-- from java.xml -->
+
+</svg>

Propchange: db/derby/code/trunk/tools/javadoc/moduleDiagrams/commons.svg
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/tools/javadoc/moduleDiagrams/engine.svg
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/moduleDiagrams/engine.svg?rev=1844197&view=auto
==============================================================================
--- db/derby/code/trunk/tools/javadoc/moduleDiagrams/engine.svg (added)
+++ db/derby/code/trunk/tools/javadoc/moduleDiagrams/engine.svg Thu Oct 18 03:36:02 2018
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  version="1.1" 
+  width="950"
+  height="500"
+  font-size="20px"
+>
+
+<title>Module Diagram for org.apache.derby.engine</title>
+
+<desc>
+This diagram shows how org.apache.derby.engine depends on other
+modules supplied by Derby, the JVM, and third-parties. To improve
+readability, direct dependencies are omitted when they can be
+deduced by walking the graph.
+</desc>
+
+<style>
+  text.jdk { stroke:black; text-anchor:middle }
+  text.thirdParty { stroke:pink; text-anchor:middle }
+  text.optional { font:italic; stroke:gray; text-anchor:middle }
+  text.derby { stroke:blue; text-anchor:middle }
+
+  line { stroke-width:1; stroke:black; marker-end:url(#arrowhead)}
+</style>
+
+<defs>
+    <marker
+      id="arrowhead"
+      markerWidth="10"
+      markerHeight="7" 
+      refX="0"
+      refY="3.5"
+      orient="auto"
+    >
+      <polygon points="0 0, 10 3.5, 0 7" />
+    </marker>
+</defs>
+
+<!-- Derby Modules -->
+
+<text x="540" y="180" class="optional">org.apache.derby.tools</text>
+<text x="260" y="240" class="derby">org.apache.derby.engine</text>
+<text x="840" y="240" class="optional">org.apache.derby.locale_*</text>
+
+<text x="690" y="300" class="derby">org.apache.derby.commons</text>
+
+<!-- 3rd Party Modules -->
+
+<text x="100" y="300" class="optional">org.osgi.framework</text>
+
+<!-- JDK Modules -->
+
+<text x="690" y="360" class="jdk">java.sql</text>
+
+<text x="250" y="420" class="optional">java.management</text>
+<text x="400" y="420" class="optional">java.naming</text>
+<text x="530" y="420" class="jdk">java.logging</text>
+<text x="690" y="420" class="jdk">java.transaction.xa</text>
+<text x="840" y="420" class="jdk">java.xml</text>
+
+<text x="500" y="480" class="jdk">java.base</text>
+
+<!-- Arcs from org.apache.derby.tools -->
+
+<line x1="445" y1="190" x2="370" y2="220" /> <!-- to org.apache.derby.engine -->
+
+<!-- Arcs from org.apache.derby.engine -->
+
+<line x1="170" y1="250" x2="170" y2="270" /> <!-- to org.osgi.framework -->
+<line x1="250" y1="250" x2="250" y2="390" /> <!-- to java.management -->
+<line x1="350" y1="250" x2="350" y2="390" /> <!-- to java.naming -->
+<line x1="360" y1="245" x2="570" y2="280" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.locale_* -->
+
+<line x1="790" y1="250" x2="790" y2="270" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.commons -->
+
+<line x1="690" y1="310" x2="690" y2="330" /> <!-- to java.sql -->
+
+<!-- Arcs from java.sql -->
+
+<line x1="650" y1="370" x2="600" y2="395" /> <!-- to java.logging -->
+<line x1="690" y1="370" x2="690" y2="390" /> <!-- to java.transaction.xa -->
+<line x1="730" y1="370" x2="780" y2="395" /> <!-- to java.xml -->
+
+<!-- Arcs from other JDK modules to java.base  -->
+
+<line x1="250" y1="430" x2="440" y2="480" /> <!-- from java.management -->
+<line x1="400" y1="430" x2="440" y2="460" /> <!-- from java.naming -->
+<line x1="500" y1="430" x2="500" y2="450" /> <!-- from java.logging -->
+<line x1="620" y1="430" x2="560" y2="460" /> <!-- from java.transaction.xa -->
+<line x1="840" y1="430" x2="560" y2="480" /> <!-- from java.xml -->
+
+</svg>

Propchange: db/derby/code/trunk/tools/javadoc/moduleDiagrams/engine.svg
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/tools/javadoc/moduleDiagrams/optionaltools.svg
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/moduleDiagrams/optionaltools.svg?rev=1844197&view=auto
==============================================================================
--- db/derby/code/trunk/tools/javadoc/moduleDiagrams/optionaltools.svg (added)
+++ db/derby/code/trunk/tools/javadoc/moduleDiagrams/optionaltools.svg Thu Oct 18 03:36:02 2018
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  version="1.1" 
+  width="950"
+  height="500"
+  font-size="20px"
+>
+
+<title>Module Diagram for org.apache.derby.optionaltools</title>
+
+<desc>
+This diagram shows how org.apache.derby.optionaltools depends on other
+modules supplied by Derby, the JVM, and third-parties. To improve
+readability, direct dependencies are omitted when they can be
+deduced by walking the graph.
+</desc>
+
+<style>
+  text.jdk { stroke:black; text-anchor:middle }
+  text.thirdParty { stroke:pink; text-anchor:middle }
+  text.optional { font:italic; stroke:gray; text-anchor:middle }
+  text.derby { stroke:blue; text-anchor:middle }
+
+  line { stroke-width:1; stroke:black; marker-end:url(#arrowhead)}
+</style>
+
+<defs>
+    <marker
+      id="arrowhead"
+      markerWidth="10"
+      markerHeight="7" 
+      refX="0"
+      refY="3.5"
+      orient="auto"
+    >
+      <polygon points="0 0, 10 3.5, 0 7" />
+    </marker>
+</defs>
+
+<!-- Derby Modules -->
+
+<text x="260" y="120" class="derby">org.apache.derby.optionaltools</text>
+<text x="540" y="180" class="derby">org.apache.derby.tools</text>
+<text x="260" y="240" class="derby">org.apache.derby.engine</text>
+<text x="840" y="240" class="optional">org.apache.derby.locale_*</text>
+
+<text x="690" y="300" class="derby">org.apache.derby.commons</text>
+
+<!-- 3rd Party Modules -->
+
+<text x="105" y="80" class="optional">json.simple</text>
+<text x="105" y="160" class="optional">lucene.core</text>
+<text x="105" y="180" class="optional">lucene.queryparser</text>
+<text x="110" y="200" class="optional">lucene.analyzers.common</text>
+
+<text x="100" y="300" class="optional">org.osgi.framework</text>
+
+<!-- JDK Modules -->
+
+<text x="690" y="360" class="jdk">java.sql</text>
+
+<text x="250" y="420" class="optional">java.management</text>
+<text x="400" y="420" class="optional">java.naming</text>
+<text x="530" y="420" class="jdk">java.logging</text>
+<text x="690" y="420" class="jdk">java.transaction.xa</text>
+<text x="840" y="420" class="jdk">java.xml</text>
+
+<text x="500" y="480" class="jdk">java.base</text>
+
+<!-- Arcs from org.apache.derby.optionaltools -->
+
+<line x1="130" y1="110" x2="105" y2="95" /> <!-- to json.simple -->
+<line x1="130" y1="130" x2="105" y2="140" /> <!-- to lucene.core -->
+<line x1="170" y1="130" x2="170" y2="150" /> <!-- to lucene.queryparser -->
+<line x1="200" y1="130" x2="200" y2="170" /> <!-- to lucene.analyzers.common -->
+<line x1="390" y1="130" x2="440" y2="160" /> <!-- to org.apache.derby.tools -->
+
+<!-- Arcs from org.apache.derby.tools -->
+
+<line x1="445" y1="190" x2="370" y2="220" /> <!-- to org.apache.derby.engine -->
+
+<!-- Arcs from org.apache.derby.engine -->
+
+<line x1="170" y1="250" x2="170" y2="270" /> <!-- to org.osgi.framework -->
+<line x1="250" y1="250" x2="250" y2="390" /> <!-- to java.management -->
+<line x1="350" y1="250" x2="350" y2="390" /> <!-- to java.naming -->
+<line x1="360" y1="245" x2="570" y2="280" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.locale_* -->
+
+<line x1="790" y1="250" x2="790" y2="270" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.commons -->
+
+<line x1="690" y1="310" x2="690" y2="330" /> <!-- to java.sql -->
+
+<!-- Arcs from java.sql -->
+
+<line x1="650" y1="370" x2="600" y2="395" /> <!-- to java.logging -->
+<line x1="690" y1="370" x2="690" y2="390" /> <!-- to java.transaction.xa -->
+<line x1="730" y1="370" x2="780" y2="395" /> <!-- to java.xml -->
+
+<!-- Arcs from other JDK modules to java.base  -->
+
+<line x1="250" y1="430" x2="440" y2="480" /> <!-- from java.management -->
+<line x1="400" y1="430" x2="440" y2="460" /> <!-- from java.naming -->
+<line x1="500" y1="430" x2="500" y2="450" /> <!-- from java.logging -->
+<line x1="620" y1="430" x2="560" y2="460" /> <!-- from java.transaction.xa -->
+<line x1="840" y1="430" x2="560" y2="480" /> <!-- from java.xml -->
+
+</svg>

Propchange: db/derby/code/trunk/tools/javadoc/moduleDiagrams/optionaltools.svg
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/tools/javadoc/moduleDiagrams/runner.svg
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/moduleDiagrams/runner.svg?rev=1844197&view=auto
==============================================================================
--- db/derby/code/trunk/tools/javadoc/moduleDiagrams/runner.svg (added)
+++ db/derby/code/trunk/tools/javadoc/moduleDiagrams/runner.svg Thu Oct 18 03:36:02 2018
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  version="1.1" 
+  width="950"
+  height="500"
+  font-size="20px"
+>
+
+<title>Module Diagram for org.apache.derby.runner</title>
+
+<desc>
+This diagram shows how org.apache.derby.runner depends on other
+modules supplied by Derby, the JVM, and third-parties. To improve
+readability, direct dependencies are omitted when they can be
+deduced by walking the graph.
+</desc>
+
+<style>
+  text.jdk { stroke:black; text-anchor:middle }
+  text.thirdParty { stroke:pink; text-anchor:middle }
+  text.optional { font:italic; stroke:gray; text-anchor:middle }
+  text.derby { stroke:blue; text-anchor:middle }
+
+  line { stroke-width:1; stroke:black; marker-end:url(#arrowhead)}
+</style>
+
+<defs>
+    <marker
+      id="arrowhead"
+      markerWidth="10"
+      markerHeight="7" 
+      refX="0"
+      refY="3.5"
+      orient="auto"
+    >
+      <polygon points="0 0, 10 3.5, 0 7" />
+    </marker>
+</defs>
+
+<!-- Derby Modules -->
+
+<text x="540" y="60" class="derby">org.apache.derby.runner</text>
+<text x="540" y="120" class="derby">org.apache.derby.server</text>
+<text x="540" y="180" class="derby">org.apache.derby.tools</text>
+<text x="260" y="240" class="derby">org.apache.derby.engine</text>
+<text x="840" y="240" class="optional">org.apache.derby.locale_*</text>
+
+<text x="690" y="300" class="derby">org.apache.derby.commons</text>
+
+<!-- JDK Modules -->
+
+<text x="690" y="360" class="jdk">java.sql</text>
+
+<text x="400" y="420" class="optional">java.naming</text>
+<text x="530" y="420" class="jdk">java.logging</text>
+<text x="690" y="420" class="jdk">java.transaction.xa</text>
+<text x="840" y="420" class="jdk">java.xml</text>
+
+<text x="500" y="480" class="jdk">java.base</text>
+
+<!-- Arcs from org.apache.derby.runner -->
+
+<line x1="540" y1="70" x2="540" y2="90" /> <!-- to org.apache.derby.server -->
+
+<!-- Arcs from org.apache.derby.server -->
+
+<line x1="540" y1="130" x2="540" y2="150" /> <!-- to org.apache.derby.tools -->
+
+<!-- Arcs from org.apache.derby.tools -->
+
+<line x1="445" y1="190" x2="370" y2="220" /> <!-- to org.apache.derby.engine -->
+
+<!-- Arcs from org.apache.derby.engine -->
+
+<line x1="350" y1="250" x2="350" y2="390" /> <!-- to java.naming -->
+<line x1="360" y1="245" x2="570" y2="280" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.locale_* -->
+
+<line x1="790" y1="250" x2="790" y2="270" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.commons -->
+
+<line x1="690" y1="310" x2="690" y2="330" /> <!-- to java.sql -->
+
+<!-- Arcs from java.sql -->
+
+<line x1="650" y1="370" x2="600" y2="395" /> <!-- to java.logging -->
+<line x1="690" y1="370" x2="690" y2="390" /> <!-- to java.transaction.xa -->
+<line x1="730" y1="370" x2="780" y2="395" /> <!-- to java.xml -->
+
+<!-- Arcs from other JDK modules to java.base  -->
+
+<line x1="400" y1="430" x2="440" y2="460" /> <!-- from java.naming -->
+<line x1="500" y1="430" x2="500" y2="450" /> <!-- from java.logging -->
+<line x1="620" y1="430" x2="560" y2="460" /> <!-- from java.transaction.xa -->
+<line x1="840" y1="430" x2="560" y2="480" /> <!-- from java.xml -->
+
+</svg>

Propchange: db/derby/code/trunk/tools/javadoc/moduleDiagrams/runner.svg
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/tools/javadoc/moduleDiagrams/server.svg
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/moduleDiagrams/server.svg?rev=1844197&view=auto
==============================================================================
--- db/derby/code/trunk/tools/javadoc/moduleDiagrams/server.svg (added)
+++ db/derby/code/trunk/tools/javadoc/moduleDiagrams/server.svg Thu Oct 18 03:36:02 2018
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  version="1.1" 
+  width="950"
+  height="500"
+  font-size="20px"
+>
+
+<title>Module Diagram for org.apache.derby.server</title>
+
+<desc>
+This diagram shows how org.apache.derby.server depends on other
+modules supplied by Derby, the JVM, and third-parties. To improve
+readability, direct dependencies are omitted when they can be
+deduced by walking the graph.
+</desc>
+
+<style>
+  text.jdk { stroke:black; text-anchor:middle }
+  text.thirdParty { stroke:pink; text-anchor:middle }
+  text.optional { font:italic; stroke:gray; text-anchor:middle }
+  text.derby { stroke:blue; text-anchor:middle }
+
+  line { stroke-width:1; stroke:black; marker-end:url(#arrowhead)}
+</style>
+
+<defs>
+    <marker
+      id="arrowhead"
+      markerWidth="10"
+      markerHeight="7" 
+      refX="0"
+      refY="3.5"
+      orient="auto"
+    >
+      <polygon points="0 0, 10 3.5, 0 7" />
+    </marker>
+</defs>
+
+<!-- Derby Modules -->
+
+<text x="540" y="120" class="derby">org.apache.derby.server</text>
+<text x="540" y="180" class="derby">org.apache.derby.tools</text>
+<text x="260" y="240" class="derby">org.apache.derby.engine</text>
+<text x="840" y="240" class="optional">org.apache.derby.locale_*</text>
+
+<text x="690" y="300" class="derby">org.apache.derby.commons</text>
+
+<!-- 3rd Party Modules -->
+
+<text x="100" y="300" class="optional">org.osgi.framework</text>
+
+<!-- JDK Modules -->
+
+<text x="690" y="360" class="jdk">java.sql</text>
+
+<text x="250" y="420" class="optional">java.management</text>
+<text x="400" y="420" class="optional">java.naming</text>
+<text x="530" y="420" class="jdk">java.logging</text>
+<text x="690" y="420" class="jdk">java.transaction.xa</text>
+<text x="840" y="420" class="jdk">java.xml</text>
+
+<text x="500" y="480" class="jdk">java.base</text>
+
+<!-- Arcs from org.apache.derby.server -->
+
+<line x1="540" y1="130" x2="540" y2="150" /> <!-- to org.apache.derby.tools -->
+
+<!-- Arcs from org.apache.derby.tools -->
+
+<line x1="445" y1="190" x2="370" y2="220" /> <!-- to org.apache.derby.engine -->
+
+<!-- Arcs from org.apache.derby.engine -->
+
+<line x1="170" y1="250" x2="170" y2="270" /> <!-- to org.osgi.framework -->
+<line x1="250" y1="250" x2="250" y2="390" /> <!-- to java.management -->
+<line x1="350" y1="250" x2="350" y2="390" /> <!-- to java.naming -->
+<line x1="360" y1="245" x2="570" y2="280" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.locale_* -->
+
+<line x1="790" y1="250" x2="790" y2="270" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.commons -->
+
+<line x1="690" y1="310" x2="690" y2="330" /> <!-- to java.sql -->
+
+<!-- Arcs from java.sql -->
+
+<line x1="650" y1="370" x2="600" y2="395" /> <!-- to java.logging -->
+<line x1="690" y1="370" x2="690" y2="390" /> <!-- to java.transaction.xa -->
+<line x1="730" y1="370" x2="780" y2="395" /> <!-- to java.xml -->
+
+<!-- Arcs from other JDK modules to java.base  -->
+
+<line x1="250" y1="430" x2="440" y2="480" /> <!-- from java.management -->
+<line x1="400" y1="430" x2="440" y2="460" /> <!-- from java.naming -->
+<line x1="500" y1="430" x2="500" y2="450" /> <!-- from java.logging -->
+<line x1="620" y1="430" x2="560" y2="460" /> <!-- from java.transaction.xa -->
+<line x1="840" y1="430" x2="560" y2="480" /> <!-- from java.xml -->
+
+</svg>

Propchange: db/derby/code/trunk/tools/javadoc/moduleDiagrams/server.svg
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/tools/javadoc/moduleDiagrams/tests.svg
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/moduleDiagrams/tests.svg?rev=1844197&view=auto
==============================================================================
--- db/derby/code/trunk/tools/javadoc/moduleDiagrams/tests.svg (added)
+++ db/derby/code/trunk/tools/javadoc/moduleDiagrams/tests.svg Thu Oct 18 03:36:02 2018
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  version="1.1" 
+  width="950"
+  height="500"
+  font-size="20px"
+>
+
+<title>Module Diagram for org.apache.derby.tests</title>
+
+<desc>
+This diagram shows how org.apache.derby.tests depends on other
+modules supplied by Derby, the JVM, and third-parties. To improve
+readability, direct dependencies are omitted when they can be
+deduced by walking the graph.
+</desc>
+
+<style>
+  text.jdk { stroke:black; text-anchor:middle }
+  text.thirdParty { stroke:pink; text-anchor:middle }
+  text.optional { font:italic; stroke:gray; text-anchor:middle }
+  text.derby { stroke:blue; text-anchor:middle }
+
+  line { stroke-width:1; stroke:black; marker-end:url(#arrowhead)}
+</style>
+
+<defs>
+    <marker
+      id="arrowhead"
+      markerWidth="10"
+      markerHeight="7" 
+      refX="0"
+      refY="3.5"
+      orient="auto"
+    >
+      <polygon points="0 0, 10 3.5, 0 7" />
+    </marker>
+</defs>
+
+<!-- Derby Modules -->
+
+<text x="835" y="20" class="derby">org.apache.derby.tests</text>
+<text x="540" y="60" class="derby">org.apache.derby.runner</text>
+<text x="260" y="120" class="derby">org.apache.derby.optionaltools</text>
+<text x="540" y="120" class="derby">org.apache.derby.server</text>
+<text x="540" y="180" class="derby">org.apache.derby.tools</text>
+<text x="260" y="240" class="derby">org.apache.derby.engine</text>
+<text x="540" y="240" class="derby">org.apache.derby.client</text>
+<text x="840" y="240" class="derby">org.apache.derby.locale_*</text>
+
+<text x="690" y="300" class="derby">org.apache.derby.commons</text>
+
+<!-- 3rd Party Modules -->
+
+<text x="105" y="80" class="thirdParty">json.simple</text>
+<text x="105" y="160" class="thirdParty">lucene.core</text>
+<text x="105" y="180" class="thirdParty">lucene.queryparser</text>
+<text x="110" y="200" class="thirdParty">lucene.analyzers.common</text>
+
+<text x="100" y="300" class="thirdParty">org.osgi.framework</text>
+
+<!-- JDK Modules -->
+
+<text x="690" y="360" class="jdk">java.sql</text>
+
+<text x="250" y="420" class="jdk">java.management</text>
+<text x="400" y="420" class="jdk">java.naming</text>
+<text x="530" y="420" class="jdk">java.logging</text>
+<text x="690" y="420" class="jdk">java.transaction.xa</text>
+<text x="840" y="420" class="jdk">java.xml</text>
+
+<text x="500" y="480" class="jdk">java.base</text>
+
+<!-- Arcs from org.apache.derby.tests -->
+
+<line x1="740" y1="25" x2="650" y2="45" /> <!-- to org.apache.derby.runner -->
+
+<!-- Arcs from org.apache.derby.runner -->
+
+<line x1="540" y1="70" x2="540" y2="90" /> <!-- to org.apache.derby.server -->
+
+<!-- Arcs from org.apache.derby.optionaltools -->
+
+<line x1="130" y1="110" x2="105" y2="95" /> <!-- to json.simple -->
+<line x1="130" y1="130" x2="105" y2="140" /> <!-- to lucene.core -->
+<line x1="170" y1="130" x2="170" y2="150" /> <!-- to lucene.queryparser -->
+<line x1="200" y1="130" x2="200" y2="170" /> <!-- to lucene.analyzers.common -->
+<line x1="390" y1="130" x2="440" y2="160" /> <!-- to org.apache.derby.tools -->
+
+<!-- Arcs from org.apache.derby.server -->
+
+<line x1="540" y1="130" x2="540" y2="150" /> <!-- to org.apache.derby.tools -->
+
+<!-- Arcs from org.apache.derby.tools -->
+
+<line x1="445" y1="190" x2="370" y2="220" /> <!-- to org.apache.derby.engine -->
+<line x1="540" y1="190" x2="540" y2="210" /> <!-- to org.apache.derby.client -->
+
+<!-- Arcs from org.apache.derby.engine -->
+
+<line x1="170" y1="250" x2="170" y2="270" /> <!-- to org.osgi.framework -->
+<line x1="250" y1="250" x2="250" y2="390" /> <!-- to java.management -->
+<line x1="350" y1="250" x2="350" y2="390" /> <!-- to java.naming -->
+<line x1="360" y1="245" x2="570" y2="280" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.client -->
+
+<line x1="450" y1="250" x2="450" y2="390" /> <!-- to java.naming -->
+<line x1="630" y1="250" x2="630" y2="270" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.locale_* -->
+
+<line x1="790" y1="250" x2="790" y2="270" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.commons -->
+
+<line x1="690" y1="310" x2="690" y2="330" /> <!-- to java.sql -->
+
+<!-- Arcs from java.sql -->
+
+<line x1="650" y1="370" x2="600" y2="395" /> <!-- to java.logging -->
+<line x1="690" y1="370" x2="690" y2="390" /> <!-- to java.transaction.xa -->
+<line x1="730" y1="370" x2="780" y2="395" /> <!-- to java.xml -->
+
+<!-- Arcs from other JDK modules to java.base  -->
+
+<line x1="250" y1="430" x2="440" y2="480" /> <!-- from java.management -->
+<line x1="400" y1="430" x2="440" y2="460" /> <!-- from java.naming -->
+<line x1="500" y1="430" x2="500" y2="450" /> <!-- from java.logging -->
+<line x1="620" y1="430" x2="560" y2="460" /> <!-- from java.transaction.xa -->
+<line x1="840" y1="430" x2="560" y2="480" /> <!-- from java.xml -->
+
+</svg>

Propchange: db/derby/code/trunk/tools/javadoc/moduleDiagrams/tests.svg
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/tools/javadoc/moduleDiagrams/tools.svg
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/moduleDiagrams/tools.svg?rev=1844197&view=auto
==============================================================================
--- db/derby/code/trunk/tools/javadoc/moduleDiagrams/tools.svg (added)
+++ db/derby/code/trunk/tools/javadoc/moduleDiagrams/tools.svg Thu Oct 18 03:36:02 2018
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  version="1.1" 
+  width="950"
+  height="500"
+  font-size="20px"
+>
+
+<title>Module Diagram for org.apache.derby.tools</title>
+
+<desc>
+This diagram shows how org.apache.derby.tools depends on other
+modules supplied by Derby, the JVM, and third-parties. To improve
+readability, direct dependencies are omitted when they can be
+deduced by walking the graph.
+</desc>
+
+<style>
+  text.jdk { stroke:black; text-anchor:middle }
+  text.thirdParty { stroke:pink; text-anchor:middle }
+  text.optional { font:italic; stroke:gray; text-anchor:middle }
+  text.derby { stroke:blue; text-anchor:middle }
+
+  line { stroke-width:1; stroke:black; marker-end:url(#arrowhead)}
+</style>
+
+<defs>
+    <marker
+      id="arrowhead"
+      markerWidth="10"
+      markerHeight="7" 
+      refX="0"
+      refY="3.5"
+      orient="auto"
+    >
+      <polygon points="0 0, 10 3.5, 0 7" />
+    </marker>
+</defs>
+
+<!-- Derby Modules -->
+
+<text x="540" y="180" class="derby">org.apache.derby.tools</text>
+<text x="260" y="240" class="optional">org.apache.derby.engine</text>
+<text x="540" y="240" class="optional">org.apache.derby.client</text>
+<text x="840" y="240" class="optional">org.apache.derby.locale_*</text>
+
+<text x="690" y="300" class="derby">org.apache.derby.commons</text>
+
+<!-- 3rd Party Modules -->
+
+<text x="100" y="300" class="optional">org.osgi.framework</text>
+
+<!-- JDK Modules -->
+
+<text x="690" y="360" class="jdk">java.sql</text>
+
+<text x="250" y="420" class="optional">java.management</text>
+<text x="400" y="420" class="optional">java.naming</text>
+<text x="530" y="420" class="jdk">java.logging</text>
+<text x="690" y="420" class="jdk">java.transaction.xa</text>
+<text x="840" y="420" class="jdk">java.xml</text>
+
+<text x="500" y="480" class="jdk">java.base</text>
+
+<!-- Arcs from org.apache.derby.tools -->
+
+<line x1="445" y1="190" x2="370" y2="220" /> <!-- to org.apache.derby.engine -->
+<line x1="540" y1="190" x2="540" y2="210" /> <!-- to org.apache.derby.client -->
+
+<!-- Arcs from org.apache.derby.engine -->
+
+<line x1="170" y1="250" x2="170" y2="270" /> <!-- to org.osgi.framework -->
+<line x1="250" y1="250" x2="250" y2="390" /> <!-- to java.management -->
+<line x1="350" y1="250" x2="350" y2="390" /> <!-- to java.naming -->
+<line x1="360" y1="245" x2="570" y2="280" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.client -->
+
+<line x1="450" y1="250" x2="450" y2="390" /> <!-- to java.naming -->
+<line x1="630" y1="250" x2="630" y2="270" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.locale_* -->
+
+<line x1="790" y1="250" x2="790" y2="270" /> <!-- to org.apache.derby.commons -->
+
+<!-- Arcs from org.apache.derby.commons -->
+
+<line x1="690" y1="310" x2="690" y2="330" /> <!-- to java.sql -->
+
+<!-- Arcs from java.sql -->
+
+<line x1="650" y1="370" x2="600" y2="395" /> <!-- to java.logging -->
+<line x1="690" y1="370" x2="690" y2="390" /> <!-- to java.transaction.xa -->
+<line x1="730" y1="370" x2="780" y2="395" /> <!-- to java.xml -->
+
+<!-- Arcs from other JDK modules to java.base  -->
+
+<line x1="250" y1="430" x2="440" y2="480" /> <!-- from java.management -->
+<line x1="400" y1="430" x2="440" y2="460" /> <!-- from java.naming -->
+<line x1="500" y1="430" x2="500" y2="450" /> <!-- from java.logging -->
+<line x1="620" y1="430" x2="560" y2="460" /> <!-- from java.transaction.xa -->
+<line x1="840" y1="430" x2="560" y2="480" /> <!-- from java.xml -->
+
+</svg>

Propchange: db/derby/code/trunk/tools/javadoc/moduleDiagrams/tools.svg
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message