cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dkazimirc...@apache.org
Subject svn commit: r1176785 - in /cayenne/main/trunk/docs/docbook: getting-started-rop/src/docbkx/ getting-started/src/docbkx/ stylesheets/
Date Wed, 28 Sep 2011 08:46:21 GMT
Author: dkazimirchyk
Date: Wed Sep 28 08:46:21 2011
New Revision: 1176785

URL: http://svn.apache.org/viewvc?rev=1176785&view=rev
Log:
Docbook: removed links and corrected image paths

Modified:
    cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/authentification.xml
    cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/client-code.xml
    cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/client-project.xml
    cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/web-service.xml
    cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/delete.xml
    cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/java-classes.xml
    cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/object-context.xml
    cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/object-relational-mapping.xml
    cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/persistent-objects.xml
    cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/select-query.xml
    cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/setup.xml
    cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/starting-project.xml
    cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/webapp.xml
    cayenne/main/trunk/docs/docbook/stylesheets/pdf.xsl

Modified: cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/authentification.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/authentification.xml?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/authentification.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/authentification.xml Wed
Sep 28 08:46:21 2011
@@ -42,7 +42,7 @@
                         <mediaobject>
                             <imageobject>
                                 <imagedata
-                                    fileref="../images/warning.gif"
+                                    fileref="images/warning.gif"
                                     depth="16" width="16"/>
                             </imageobject>
                         </mediaobject>

Modified: cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/client-code.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/client-code.xml?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/client-code.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/client-code.xml Wed Sep
28 08:46:21 2011
@@ -127,7 +127,8 @@ INFO: === returned 2 rows. - took 15 ms.
 INFO: +++ transaction committed.
 INFO: --- will run 1 query.
 INFO: --- transaction started.
-INFO: SELECT t0.GALLERY_ID, t0.ARTIST_ID, t0.NAME, t0.ID FROM PAINTING t0 WHERE UPPER(t0.NAME)
LIKE UPPER(?) [bind: 1-&gt;NAME:'gi%']
+INFO: SELECT t0.GALLERY_ID, t0.ARTIST_ID, t0.NAME, t0.ID FROM PAINTING t0
+      WHERE UPPER(t0.NAME) LIKE UPPER(?) [bind: 1-&gt;NAME:'gi%']
 INFO: === returned 1 row. - took 9 ms.
 INFO: +++ transaction committed.
 INFO: --- will run 1 query.

Modified: cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/client-project.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/client-project.xml?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/client-project.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/client-project.xml Wed
Sep 28 08:46:21 2011
@@ -4,9 +4,9 @@
     <title>Starting client project...</title>
     <section xml:id="create-rop-client-project">
         <title>Create an ROP Client Project in Eclipse</title>
-        <para>Creation of a new Eclipse project has been discussed in some details
<link
-                xlink:href="http://cayenne.apache.org/doc30/tutorial-starting-project.html"
-                >here</link>, so we will omit the screenshots for the common parts.</para>
+        <para>Creation of a new Eclipse project has been discussed in some details
in "Getting
+            Started with Cayenne" guide, so we will omit the screenshots for the common
+            parts.</para>
         <para>In Eclipse select "File &gt; New &gt; Other..." and then "Maven
&gt; Maven Project".
             Click "Next". On the following screen check "Create a simple project" checkbox
and click
             "Next" again. In the dialog shown on the screenshot below, enter "org.example.cayenne"
@@ -38,7 +38,7 @@
                     all entities.</para>
                 <para><inlinemediaobject>
                         <imageobject>
-                            <imagedata fileref="../images/datamap-enableclient.png" scalefit="1"
width="100%"/>
+                            <imagedata fileref="images/datamap-enableclient.png" scalefit="1"
width="100%"/>
                         </imageobject>
                     </inlinemediaobject></para>
             </listitem>

Modified: cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/web-service.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/web-service.xml?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/web-service.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started-rop/src/docbkx/web-service.xml Wed Sep
28 08:46:21 2011
@@ -46,12 +46,12 @@
                     <td rowspan="1" colspan="1" valign="top">
                         <mediaobject>
                             <imageobject>
-                                <imagedata fileref="../images/warning.gif" depth="16"
width="16"/>
+                                <imagedata fileref="images/warning.gif" depth="16" width="16"/>
                             </imageobject>
                         </mediaobject>
                     </td>
                     <td rowspan="1" colspan="1"><emphasis role="bold">Maven Optimization
-                            Hint</emphasis>On a real project both server and client
modules will
+                            Hint</emphasis> On a real project both server and client
modules will
                         likely share a common parent pom.xml where common repository delcaration
can
                         be placed, with child pom's "inheriting" it from parent. This would
reduce
                         build code duplication.</td>
@@ -94,14 +94,15 @@
                     <td rowspan="1" colspan="1" valign="top">
                         <mediaobject>
                             <imageobject>
-                                <imagedata fileref="../images/warning.gif" depth="16"
width="16"/>
+                                <imagedata fileref="images/warning.gif" depth="16" width="16"/>
                             </imageobject>
                         </mediaobject>
                     </td>
                     <td rowspan="1" colspan="1"><emphasis role="bold">Extending
Server Behavior via
-                            Callbacks</emphasis>While no custom Java code is required
on the server,
-                        just a service declaration, it is possible to customizing server-side
-                        behavior via callbacks and listeners (not shown in the tutorial).</td>
+                            Callbacks</emphasis> While no custom Java code is required
on the
+                        server, just a service declaration, it is possible to customizing
+                        server-side behavior via callbacks and listeners (not shown in the
+                        tutorial).</td>
                 </tr>
             </tbody>
         </informaltable>

Modified: cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/delete.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/delete.xml?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/delete.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/delete.xml Wed Sep 28 08:46:21
2011
@@ -9,8 +9,7 @@
     <section xml:id="setup-delete-rules">
         <title>Setting Up Delete Rules</title>
         <para>Before we discuss the API for object deletion, lets go back to CayenneModeler
and set
-            up some <link xlink:href="http://cayenne.apache.org/doc/delete-rules.html">delete
-                rules</link>. Doing this is optional but will simplify correct handling
of the
+            up some delete rules. Doing this is optional but will simplify correct handling
of the
             objects related to deleted objects.</para>
         <para>In the Modeler go to "Artist" ObjEntity, "Relationships" tab and select
"Cascade" for
             the "paintings" relationship delete rule:</para>

Modified: cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/java-classes.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/java-classes.xml?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/java-classes.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/java-classes.xml Wed Sep 28
08:46:21 2011
@@ -57,13 +57,12 @@
         <para>Your computer must be connected to the internet. Once you save the pom.xml,
Eclipse
             will download the needed Cayenne jar file and add it to the project build path.
As a
             result, all the errors should disappear.</para>
-        <para>Now let's check the entity class pairs. Each one is made of a superclass
(e.g.
-                <emphasis role="italic">Artist) and a subclass (e.g. Artist). You <emphasis
-                    role="bold">should not</emphasis> modify the superclasses whose
names start with
-                "</emphasis>" (underscore), as they will be replaced on subsequent
generator runs.
-            Instead all custom logic should be placed in the subclasses in
-            "org.example.cayenne.persistent" package - those will never be overwritten by
the class
-            generator.</para>
+        <para>Now let's check the entity class pairs. Each one is made of a superclass
(e.g. Artist)
+            and a subclass (e.g. Artist). You <emphasis role="bold">should not</emphasis>
modify the
+            superclasses whose names start with "_" (underscore), as they will be replaced
on
+            subsequent generator runs. Instead all custom logic should be placed in the subclasses
+            in "org.example.cayenne.persistent" package - those will never be overwritten
by the
+            class generator.</para>
         <para>
             <informaltable>
                 <col width="4%"/>
@@ -73,7 +72,7 @@
                         <mediaobject>
                             <imageobject>
                                 <imagedata
-                                    fileref="../images/warning.gif"
+                                    fileref="images/warning.gif"
                                     depth="16" width="16"/>
                             </imageobject>
                         </mediaobject>
@@ -81,12 +80,10 @@
                     <td rowspan="1" colspan="1"><emphasis role="bold">Class Generation
                             Hint</emphasis>Often you'd start by generating classes
from the Modeler,
                         but at the later stages of the project the generation is usually
automated
-                        either via <link xlink:href="http://cayenne.apache.org/doc/cgen.html">Ant
-                            cgen task</link> or <link
-                            xlink:href="http://cayenne.apache.org/doc/maven2-cgen.html">Maven
cgen
-                            mojo</link>. All three methods are interchangeable, however
Ant and
-                        Maven methods would ensure that you never forget to regenerate classes
on
-                        mapping changes, as they are integrated into the build cycle.</td>
+                        either via Ant cgen task or Maven cgen mojo. All three methods are
+                        interchangeable, however Ant and Maven methods would ensure that
you never
+                        forget to regenerate classes on mapping changes, as they are integrated
into
+                        the build cycle.</td>
                 </tr>
             </informaltable>
         </para>

Modified: cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/object-context.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/object-context.xml?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/object-context.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/object-context.xml Wed Sep
28 08:46:21 2011
@@ -87,16 +87,14 @@ INFO: finished configuration loading in 
                         <mediaobject>
                             <imageobject>
                                 <imagedata
-                                    fileref="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif"
+                                    fileref="images/warning.gif"
                                     depth="16" width="16"/>
                             </imageobject>
                         </mediaobject>
                     </td>
                     <td rowspan="1" colspan="1"><emphasis role="bold">How to
Configure Cayenne
                             Logging</emphasis>You can tweak more or less detailed output
by
-                        following the instructions in the <link
-                            xlink:href="http://cayenne.apache.org/doc/configuring-logging.html"
-                            >logging chapter</link>.</td>
+                        following the instructions in the logging chapter.</td>
                 </tr>
             </informaltable>Nothing much happened here, but we've been able to create
a working
             Cayenne stack. In the following chapters we'll use the ObjectContext for more

Modified: cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/object-relational-mapping.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/object-relational-mapping.xml?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/object-relational-mapping.xml
(original)
+++ cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/object-relational-mapping.xml
Wed Sep 28 08:46:21 2011
@@ -8,7 +8,7 @@
         schema:</para>
     <para><inlinemediaobject>
             <imageobject>
-                <imagedata fileref="../images/database-schema.jpg"/>
+                <imagedata fileref="images/database-schema.jpg"/>
             </imageobject>
     </inlinemediaobject>
     </para>
@@ -21,7 +21,7 @@
                     <mediaobject>
                         <imageobject>
                             <imagedata
-                                fileref="../images/warning.gif"
+                                fileref="images/warning.gif"
                                 depth="16" width="16"/>
                         </imageobject>
                     </mediaobject>
@@ -49,7 +49,7 @@
             a PK:</para>
         <para><inlinemediaobject>
                 <imageobject>
-                    <imagedata fileref="../images/modeler-artistid.png" scalefit="1" width="100%"/>
+                    <imagedata fileref="images/modeler-artistid.png" scalefit="1" width="100%"/>
                 </imageobject>
             </inlinemediaobject></para>
         <para>Similarly add NAME VARCHAR(200) and DATE_OF_BIRTH DATE attributes. After
that repeat
@@ -63,7 +63,7 @@
                         <mediaobject>
                             <imageobject>
                                 <imagedata
-                                    fileref="../images/warning.gif"
+                                    fileref="images/warning.gif"
                                     depth="16" width="16"/>
                             </imageobject>
                         </mediaobject>
@@ -114,7 +114,7 @@
         </itemizedlist>
         <para><inlinemediaobject>
                 <imageobject>
-                    <imagedata fileref="../images/modeler-dbrelationship.png" scalefit="1"
width="100%"/>
+                    <imagedata fileref="images/modeler-dbrelationship.png" scalefit="1"
width="100%"/>
                 </imageobject>
             </inlinemediaobject></para>
         <itemizedlist>

Modified: cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/persistent-objects.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/persistent-objects.xml?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/persistent-objects.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/persistent-objects.xml Wed
Sep 28 08:46:21 2011
@@ -3,18 +3,15 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <title>Getting started with persistent objects...</title>
-    <para>In this section we'll learn about persistent objects, how to customize them
and how to
+    <para>In this chapter we'll learn about persistent objects, how to customize them
and how to
         create and save them in DB.</para>
     <section xml:id="customizing-persistent-objects">
         <title>Inspecting and Customizing Persistent Objects</title>
-        <para>Persistent classes in Cayenne implement a <link
-                xlink:href="http://cayenne.apache.org/doc/dataobjects.html">DataObject
-                interface</link>. If you inspect any of the classes <link
-                xlink:href="http://cayenne.apache.org/doc/tutorial-java-classes.html">generated
-                earlier</link> in this tutorial (e.g. org.example.cayenne.persistent.Artist),
you'll
-            see that it extends a class with the name that starts with underscore
-            (org.example.cayenne.persistent.auto._Artist), which in turn extends from
-            org.apache.cayenne.CayenneDataObject. Splitting each persistent class into
+        <para>Persistent classes in Cayenne implement a DataObject interface. If you
inspect any of
+            the classes generated earlier in this tutorial (e.g.
+            org.example.cayenne.persistent.Artist), you'll see that it extends a class with
the name
+            that starts with underscore (org.example.cayenne.persistent.auto._Artist), which
in turn
+            extends from org.apache.cayenne.CayenneDataObject. Splitting each persistent
class into
             user-customizable subclass (Xyz) and a generated superclass (_Xyz) is a useful
technique
             to avoid overwriting the custom code when refreshing classes from the mapping
             model.</para>
@@ -88,9 +85,8 @@ girl.setGallery(metropolitan);
 stein.setGallery(metropolitan);</programlisting>
         <para>Now lets save all five new objects, in a single method call:</para>
         <programlisting>context.commitChanges();</programlisting>
-        <para>Now you can run the application again as described <link
-                xlink:href="http://cayenne.apache.org/doc/tutorial-objectcontext.html">in
the
-                previous section</link>. The new output will show a few actual DB operations:</para>
+        <para>Now you can run the application again as described in the previous chapter.
The new
+            output will show a few actual DB operations:</para>
         <programlisting>Dec 20, 2009 11:11:37 PM org.apache.cayenne.conf.RuntimeLoadDelegate
startedLoading
 INFO: started configuration loading.
 ... 

Modified: cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/select-query.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/select-query.xml?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/select-query.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/select-query.xml Wed Sep 28
08:46:21 2011
@@ -6,15 +6,11 @@
     <para>This section shows how to select objects from the database using SelectQuery.
</para>
     <section xml:id="introducing-select-query">
         <title>Introducing SelectQuery</title>
-        <para>It was shown before how to <link
-                xlink:href="http://cayenne.apache.org/doc/tutorial-persistent-objects.html">persist
-                new objects</link>. Cayenne <link
-                xlink:href="http://cayenne.apache.org/doc/queries.html">queries</link>
are used to
-            access already saved objects. The primary query type used for selecting objects
is <link
-                xlink:href="http://cayenne.apache.org/doc/selectquery.html">SelectQuery</link>.
It
-            can be mapped in CayenneModeler or created via the API. We'll use the later approach
in
-            this section. We don't have too much data in the database yet, but we can still
-            demonstrate the main principles below.</para>
+        <para>It was shown before how to persist new objects. Cayenne queries are used
to access
+            already saved objects. The primary query type used for selecting objects is <emphasis
+                role="italic">SelectQuery</emphasis>. It can be mapped in CayenneModeler
or created
+            via the API. We'll use the later approach in this section. We don't have too
much data
+            in the database yet, but we can still demonstrate the main principles below.</para>
         <itemizedlist>
             <listitem>
                 <para>Select all paintings (the code, and the log output it generates):</para>
@@ -26,10 +22,7 @@ List paintings1 = context.performQuery(s
 INFO: === returned 2 rows. - took 18 ms.</programlisting>
         <itemizedlist>
             <listitem>
-                <para>Select paintings that start with "gi", ignoring case (read more
about
-                    qualifier Expressions and ExpressionFactory <link
-                        xlink:href="http://cayenne.apache.org/doc/expressions.html"
-                    >here</link>:</para>
+                <para>Select paintings that start with "gi", ignoring case:</para>
             </listitem>
         </itemizedlist>
         <programlisting>Expression qualifier2 = ExpressionFactory.likeIgnoreCaseExp(

Modified: cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/setup.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/setup.xml?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/setup.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/setup.xml Wed Sep 28 08:46:21
2011
@@ -13,21 +13,19 @@
     </section>
     <section xml:id="install-eclipse-and-maven">
         <title>Install Eclipse IDE and the Maven Plugin</title>
-        <para> Download Eclipse <link xlink:href="http://www.eclipse.org/downloads/">from
-                here</link>. This tutorial is based on the Galileo package (Eclipse
3.5), JEE
+        <para> Download Eclipse. This tutorial is based on the Galileo package (Eclipse
3.5), JEE
             edition, still it should work with any recent vanilla Eclipse distribution. </para>
         <para> After downloading Eclipse, unpack it somewhere in the filesystem, and
start it. The
-            only plugin that you need for the tutorial is <link
-                xlink:href="http://m2eclipse.sonatype.org/">m2eclipse</link>. To
install it, in
-            Eclipse go to "Help > Install New Software", then click on "Add.." to add
a new download
-            site, and enter "Maven" in the "Name" field, and
-            "http://m2eclipse.sonatype.org/sites/m2e" in the "Location" field. You may install
any
-            of the optional components that you think you need, but for this tutorial we
only select
-            a few basic components as shown on the following screenshot: </para>
+            only plugin that you need for the tutorial is m2eclipse. To install it, in Eclipse
go to
+            "Help > Install New Software", then click on "Add.." to add a new download
site, and
+            enter "Maven" in the "Name" field, and "<emphasis role="italic"
+                >http://m2eclipse.sonatype.org/sites/m2e</emphasis>" in the "Location"
field. You
+            may install any of the optional components that you think you need, but for this
+            tutorial we only select a few basic components as shown on the following screenshot:
</para>
         <para>
             <inlinemediaobject>
                 <imageobject>
-                    <imagedata fileref="../images/maven-plugin-install.png" scalefit="1"
width="100%"/>
+                    <imagedata fileref="images/maven-plugin-install.png" scalefit="1"
width="100%"/>
                 </imageobject>
             </inlinemediaobject></para>
         <para>

Modified: cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/starting-project.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/starting-project.xml?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/starting-project.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/starting-project.xml Wed Sep
28 08:46:21 2011
@@ -21,7 +21,7 @@
         <para>
             <inlinemediaobject>
                 <imageobject>
-                    <imagedata fileref="../images/tutorial-eclipse-project.png" scalefit="1"
width="100%"/>
+                    <imagedata fileref="images/tutorial-eclipse-project.png" scalefit="1"
width="100%"/>
                 </imageobject>
             </inlinemediaobject>
         </para>
@@ -49,30 +49,24 @@
                         <mediaobject>
                             <imageobject>
                                 <imagedata
-                                    fileref="../images/warning.gif"
+                                    fileref="images/warning.gif"
                                     depth="16" width="16"/>
                             </imageobject>
                         </mediaobject>
                     </td>
-                    <td rowspan="1" colspan="1">If you are really into Maven, you can
<link
-                            xlink:href="http://cayenne.apache.org/doc/maven2-modeler.html">start
-                            CayenneModeler from Maven</link> if you wish. We'll do
it in a more
-                        traditional way here.</td>
+                    <td rowspan="1" colspan="1">If you are really into Maven, you can
start
+                        CayenneModeler from Maven if you wish. We'll do it in a more traditional
way
+                        here.</td>
                 </tr>
             </informaltable>
         </para>
-        <para>
-            Download the latest release <link xlink:href="http://cayenne.apache.org/download.html"
-                >from here</link>. Unpack the distribution somewhere in the file
system and start
-            CayenneModeler, following <link
-                xlink:href="http://cayenne.apache.org/doc/running-cayennemodeler.html"
-                >platform-specific instructions</link>. On most platforms it is
done simply by
-            doubleclicking the Modeler icon. The welcome screen of the Modeler looks like
-            this:
-        </para>
+        <para> Download the latest release. Unpack the distribution somewhere in the
file system and
+            start CayenneModeler, following platform-specific instructions. On most platforms
it is
+            done simply by doubleclicking the Modeler icon. The welcome screen of the Modeler
looks
+            like this: </para>
         <para><inlinemediaobject>
                 <imageobject>
-                    <imagedata fileref="../images/modeler-started.png" scalefit="1" width="100%"/>
+                    <imagedata fileref="images/modeler-started.png" scalefit="1" width="100%"/>
                 </imageobject>
             </inlinemediaobject></para>
     </section>
@@ -110,7 +104,7 @@
                         <mediaobject>
                             <imageobject>
                                 <imagedata
-                                    fileref="../images/warning.gif"
+                                    fileref="images/warning.gif"
                                     depth="16" width="16"/>
                             </imageobject>
                         </mediaobject>
@@ -128,7 +122,7 @@
             starts.</para>
         <para><inlinemediaobject>
                 <imageobject>
-                    <imagedata fileref="../images/base-datanode.png" scalefit="1" width="100%"/>
+                    <imagedata fileref="images/base-datanode.png" scalefit="1" width="100%"/>
                 </imageobject>
             </inlinemediaobject></para>
         
@@ -147,7 +141,7 @@
             classes.</para>
         <para><inlinemediaobject>
                 <imageobject>
-                    <imagedata fileref="../images/base-datamap.png" scalefit="1" width="100%"/>
+                    <imagedata fileref="images/base-datamap.png" scalefit="1" width="100%"/>
                 </imageobject>
             </inlinemediaobject></para>
         
@@ -161,7 +155,7 @@
             "Refresh", you will see three Cayenne XML files.</para>
         <para><inlinemediaobject>
                 <imageobject>
-                    <imagedata fileref="../images/eclipse-xmlfiles.png"/>
+                    <imagedata fileref="images/eclipse-xmlfiles.png"/>
                 </imageobject>
             </inlinemediaobject></para>
         <para>Note that the location of the XML files is not coincidental. Cayenne
runtime looks for

Modified: cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/webapp.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/webapp.xml?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/webapp.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/webapp.xml Wed Sep 28 08:46:21
2011
@@ -23,16 +23,11 @@
             <listitem>
                 <para>The same DataContext instance is reused within a single user
session;
                     different sessions use different DataContexts (and therefore different
sets of
-                    objects). <emphasis role="italic">However see "ObjectContext Scope"
section of
-                        the <link xlink:href="http://cayenne.apache.org/doc/web-applications.html"
-                            >Web Applications</link> page. The context can be scoped
differently
+                    objects). <emphasis role="italic">The context can be scoped differently
                         depending on the app specifics. For the tutorial we'll be using a
                         session-scoped context.</emphasis></para>
             </listitem>
         </itemizedlist>
-        <para>For more information on the web application deployment, check <link
-                xlink:href="http://cayenne.apache.org/doc/web-applications.html">Web
-                Applications</link> page.</para>
         <para>So let's convert the tutorial that we created to a web application:</para>
         <itemizedlist>
             <listitem>
@@ -45,7 +40,8 @@
                     <emphasis role="bold">web.xml</emphasis>
                     <programlisting>&lt;?xml version="1.0" encoding="utf-8"?&gt;
  &lt;!DOCTYPE web-app
-   PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"  "http://java.sun.com/dtd/web-app_2_3.dtd"&gt;
+   PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+  "http://java.sun.com/dtd/web-app_2_3.dtd"&gt;
 &lt;web-app&gt;
     &lt;display-name&gt;Cayenne Tutorial&lt;/display-name&gt;
 
@@ -127,13 +123,13 @@
 
     if("POST".equals(request.getMethod())) {
         // if no id is saved in the hidden field, we are dealing with
- // create new artist request
- if(artist == null) {
+        // create new artist request
+        if(artist == null) {
             artist = context.newObject(Artist.class);
         }
 
         // note that in a real application we would so dome validation ...
- // here we just hope the input is correct
+        // here we just hope the input is correct
         artist.setName(request.getParameter("name"));
         artist.setDateOfBirthString(request.getParameter("dateOfBirth"));
 
@@ -203,7 +199,7 @@
                     screenshot:</para>
                 <para><inlinemediaobject>
                         <imageobject>
-                            <imagedata fileref="../images/eclipse-mvnrun.png" scalefit="1"
width="100%"/>
+                            <imagedata fileref="images/eclipse-mvnrun.png" scalefit="1"
width="100%"/>
                         </imageobject>
                     </inlinemediaobject></para>
             </listitem>
@@ -253,10 +249,9 @@ INFO: finished configuration loading in 
                 <para>So the Jetty container just started and loaded Cayenne.</para>
             </listitem>
             <listitem>
-                <para>Now go to <link xlink:href="http://localhost:8080/tutorial/"
-                        >http://localhost:8080/tutorial/</link> URL. You should
see "No artists
-                    found message" in the web browser and the following output in the Eclipse
-                    console:</para>
+                <para>Now go to <emphasis role="italic">http://localhost:8080/tutorial/</emphasis>
+                            URL. You should see "No artists found message" in the web browser
and
+                            the following output in the Eclipse console:</para>
             </listitem>
         </itemizedlist>
         <programlisting>INFO: --- will run 1 query.
@@ -275,7 +270,8 @@ INFO: CREATE TABLE PAINTING (ARTIST_ID I
 ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY, NAME VARCHAR (200), PRIMARY KEY (ID))
 INFO: ALTER TABLE PAINTING ADD FOREIGN KEY (ARTIST_ID) REFERENCES ARTIST (ID)
 INFO: ALTER TABLE PAINTING ADD FOREIGN KEY (GALLERY_ID) REFERENCES GALLERY (ID)
-INFO: CREATE TABLE AUTO_PK_SUPPORT (  TABLE_NAME CHAR(100) NOT NULL,  NEXT_ID BIGINT NOT
NULL,  PRIMARY KEY(TABLE_NAME))
+INFO: CREATE TABLE AUTO_PK_SUPPORT (
+  TABLE_NAME CHAR(100) NOT NULL,  NEXT_ID BIGINT NOT NULL,  PRIMARY KEY(TABLE_NAME))
 INFO: DELETE FROM AUTO_PK_SUPPORT WHERE TABLE_NAME IN ('ARTIST', 'GALLERY', 'PAINTING')
 INFO: INSERT INTO AUTO_PK_SUPPORT (TABLE_NAME, NEXT_ID) VALUES ('ARTIST', 200)
 INFO: INSERT INTO AUTO_PK_SUPPORT (TABLE_NAME, NEXT_ID) VALUES ('GALLERY', 200)
@@ -291,7 +287,7 @@ INFO: +++ transaction committed.</progra
                     can be edited by clicking on their name:</para>
                 <para><inlinemediaobject>
                         <imageobject>
-                            <imagedata fileref="../images/firefox-webapp.png" scalefit="1"
width="100%"/>
+                            <imagedata fileref="images/firefox-webapp.png" scalefit="1"
width="100%"/>
                         </imageobject>
                     </inlinemediaobject></para>
             </listitem>

Modified: cayenne/main/trunk/docs/docbook/stylesheets/pdf.xsl
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/stylesheets/pdf.xsl?rev=1176785&r1=1176784&r2=1176785&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/stylesheets/pdf.xsl (original)
+++ cayenne/main/trunk/docs/docbook/stylesheets/pdf.xsl Wed Sep 28 08:46:21 2011
@@ -109,5 +109,7 @@
 	<xsl:attribute-set name="monospace.verbatim.properties">
 		<xsl:attribute name="font-size">7pt</xsl:attribute>
 	</xsl:attribute-set>
+	
+	<xsl:param name="img.src.path">../</xsl:param>
 
 </xsl:stylesheet>



Mime
View raw message