svn commit: r1085488 - in /db/derby/docs/trunk: ./ src/devguide/ src/tuning/

[ch...@apache.org]

Author: chaase3
Date: Fri Mar 25 17:49:10 2011
New Revision: 1085488

URL: http://svn.apache.org/viewvc?rev=1085488&view=rev
Log:
DERBY-5148 Fixes for problems with figures in documentation

Modified two topics, 7 JPEG files, and the build.xml file.

Patches: DERBY-5148.diff

Modified:
    db/derby/docs/trunk/build.xml
    db/derby/docs/trunk/src/devguide/appauth_os.jpg
    db/derby/docs/trunk/src/devguide/cdevdeploy855368.dita
    db/derby/docs/trunk/src/devguide/dead.jpg
    db/derby/docs/trunk/src/devguide/itserv_os.jpg
    db/derby/docs/trunk/src/devguide/lockwa1.jpg
    db/derby/docs/trunk/src/devguide/lockwa2.jpg
    db/derby/docs/trunk/src/devguide/lockwa3.jpg
    db/derby/docs/trunk/src/tuning/ctundepth32379.dita
    db/derby/docs/trunk/src/tuning/stmt_os.jpg

Modified: db/derby/docs/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/build.xml?rev=1085488&r1=1085487&r2=1085488&view=diff
==============================================================================
--- db/derby/docs/trunk/build.xml (original)
+++ db/derby/docs/trunk/build.xml Fri Mar 25 17:49:10 2011
@@ -229,7 +229,7 @@ limitations under the License.
     <mkdir dir="${dita.dir}/temp"/>
     <mkdir dir="${dita.output.dir}/${manual.name}"/>
     <copy todir="${dita.output.dir}/${manual.name}">
-      <fileset dir="${dita.src.dir}/${manual.name}" includes="*.jpg"/>
+      <fileset dir="${dita.src.dir}/${manual.name}" includes="*.jpg,*.gif"/>
     </copy>
     <ant dir="${dita.dir}" antfile="conductor.xml" target="dita2pdf" inheritAll="true">
       <property name="args.input" value="${temp.source}${file.separator}${manual.name}${file.separator}${manual.ditamap}"/>

Modified: db/derby/docs/trunk/src/devguide/appauth_os.jpg
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/appauth_os.jpg?rev=1085488&r1=1085487&r2=1085488&view=diff
==============================================================================
Binary files - no diff available.

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy855368.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdeploy855368.dita?rev=1085488&r1=1085487&r2=1085488&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy855368.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy855368.dita Fri Mar 25 17:49:10 2011
@@ -35,7 +35,7 @@ server. In the latter case, <ph conref="
 embedded in the user-provided server framework, and any client applications
 use user-provided connectivity or allow the application server to handle all
 database interaction.</p>
-<fig id="cdevdeploy31527"><title><ph conref="../conrefs.dita#prod/productshortname"></ph> embedded
+<fig expanse="column" id="cdevdeploy31527"><title><ph conref="../conrefs.dita#prod/productshortname"></ph> embedded
 in a single-user Java application</title>
 <image href="embed_os.gif" placement="break"><alt>This figure shows the single-user
 application and the Derby database engine inside the Java Virtual Machine.
@@ -43,7 +43,7 @@ The single-user application connects to 
 the JDBC API. The Derby database engine connects to the Derby database.</alt>
 </image>
 </fig>
-<fig id="cdevdeploy29107"><title>Derby embedded in a multi-user Java application
+<fig expanse="column" id="cdevdeploy29107"><title>Derby embedded in a multi-user Java application
 server</title>
 <image href="itserv_os.gif" placement="break"><alt>This figure shows multiple
 users connecting to the application server, which contains the application

Modified: db/derby/docs/trunk/src/devguide/dead.jpg
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/dead.jpg?rev=1085488&r1=1085487&r2=1085488&view=diff
==============================================================================
Binary files - no diff available.

Modified: db/derby/docs/trunk/src/devguide/itserv_os.jpg
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/itserv_os.jpg?rev=1085488&r1=1085487&r2=1085488&view=diff
==============================================================================
Binary files - no diff available.

Modified: db/derby/docs/trunk/src/devguide/lockwa1.jpg
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/lockwa1.jpg?rev=1085488&r1=1085487&r2=1085488&view=diff
==============================================================================
Binary files - no diff available.

Modified: db/derby/docs/trunk/src/devguide/lockwa2.jpg
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/lockwa2.jpg?rev=1085488&r1=1085487&r2=1085488&view=diff
==============================================================================
Binary files - no diff available.

Modified: db/derby/docs/trunk/src/devguide/lockwa3.jpg
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/lockwa3.jpg?rev=1085488&r1=1085487&r2=1085488&view=diff
==============================================================================
Binary files - no diff available.

Modified: db/derby/docs/trunk/src/tuning/ctundepth32379.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/ctundepth32379.dita?rev=1085488&r1=1085487&r2=1085488&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tuning/ctundepth32379.dita (original)
+++ db/derby/docs/trunk/src/tuning/ctundepth32379.dita Fri Mar 25 17:49:10 2011
@@ -69,10 +69,10 @@ current connection's flag</li>
 <note type="remember">If your application executes statements that are almost
 but not exactly alike, it is more efficient to use <i>PreparedStatements</i> with
 dynamic or IN parameters.  </note>
-<fig expanse="page" id="ctundepth12523"><title>A database can reuse a statement
+<fig expanse="column" id="ctundepth12523"><title>A database can reuse a statement
 execution plan when the SQL text matches a prior statement <i>exactly</i></title>
 <desc>(<i>PreparedStatements</i> are much more efficient.)</desc>
-<image align="center" href="stmt_os.gif" placement="break"><alt>This figure
+<image href="stmt_os.gif" placement="break"><alt>This figure
 shows how Derby can reuse a statement execution plan that is already in the
 statement cache, even when the statement is executed from a different connection.</alt>
 </image>

Modified: db/derby/docs/trunk/src/tuning/stmt_os.jpg
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/stmt_os.jpg?rev=1085488&r1=1085487&r2=1085488&view=diff
==============================================================================
Binary files - no diff available.