db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject svn commit: r239636 [4/4] - in /db/torque/runtime/trunk: ./ conf/ src/conf/ src/java/org/apache/torque/ src/java/org/apache/torque/adapter/ src/java/org/apache/torque/avalon/ src/java/org/apache/torque/dsfactory/ src/java/org/apache/torque/manager/ src...
Date Wed, 24 Aug 2005 12:38:54 GMT
Modified: db/torque/runtime/trunk/xdocs/status.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/xdocs/status.xml?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/xdocs/status.xml (original)
+++ db/torque/runtime/trunk/xdocs/status.xml Wed Aug 24 05:38:09 2005
@@ -47,20 +47,20 @@
               Added support for outer joins
             </li>
             <li>
-              Added support for creation of simple java beans 
+              Added support for creation of simple java beans
               from persistent objects
             </li>
             <li>
-              The old connection pool is removed 
+              The old connection pool is removed
               (only dbcp is supported out of the box)
             </li>
             <li>
               Some smaller changes were made in the database.dtd
-            </li>  
+            </li>
             <li>
-              The build-torque ant file for the generator 
+              The build-torque ant file for the generator
               is contained again in the generator release
-            </li>  
+            </li>
           </ul>
           You can obtain the Torque 3.2-rc1 generator, runtime and
           maven-plugin from our <a href="download.html">Download
@@ -97,26 +97,26 @@
 
       <subsection name="27 August 2004 - Torque 3.1.1-rc2 is released!">
         <p>
-          A problem handling limit and offset has been corrected.  You can 
+          A problem handling limit and offset has been corrected.  You can
           obtain the Torque 3.1.1-rc2 generator, runtime and maven-plugin from
-          the <a href="http://ibiblio.org/maven/torque/">ibiblio maven 
+          the <a href="http://ibiblio.org/maven/torque/">ibiblio maven
           repository</a>.
         </p>
       </subsection>
 
       <subsection name="26 August 2004 - Torque 3.1.1-rc1 is released!">
         <p>
-          We are working on setting up the mirrored download page for 3.1.1 
+          We are working on setting up the mirrored download page for 3.1.1
           final.  In the mean time you can obtain the Torque 3.1.1-rc1
           generator, runtime and maven-plugin from the
-          <a href="http://ibiblio.org/maven/torque/">ibiblio maven 
+          <a href="http://ibiblio.org/maven/torque/">ibiblio maven
           repository</a>.
         </p>
       </subsection>
 
       <subsection name="In Memoriam">
         <p>
-          <a href="http://www.apache.org/foundation/martin.html">Farewell to 
+          <a href="http://www.apache.org/foundation/martin.html">Farewell to
           Martin Pöschl</a>.
         </p>
       </subsection>
@@ -153,7 +153,7 @@
         <p>
           Downloads are available <a href="http://db.apache.org/builds/torque/release/3.0.2/">
           here</a>. <br/>
-          This is a bugfix release. The docs including a full list of changes is available

+          This is a bugfix release. The docs including a full list of changes is available
           <a href="http://db.apache.org/torque/torque-302/">here</a>
         </p>
       </subsection>
@@ -162,7 +162,7 @@
         <p>
           Downloads are available <a href="http://db.apache.org/builds/torque/release/3.0.1/">
           here</a>. <br/>
-          This is a bugfix release. The docs including a full list of changes is available

+          This is a bugfix release. The docs including a full list of changes is available
           <a href="http://db.apache.org/torque/torque-301/">here</a>
         </p>
       </subsection>

Modified: db/torque/runtime/trunk/xdocs/sybase-howto.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/xdocs/sybase-howto.xml?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/xdocs/sybase-howto.xml (original)
+++ db/torque/runtime/trunk/xdocs/sybase-howto.xml Wed Aug 24 05:38:09 2005
@@ -27,9 +27,9 @@
 
 <p>
 This HOWTO was written some time ago and was targeted at the
-version of Torque that was coupled with the 
+version of Torque that was coupled with the
 <a href="http://jakarta.apache.org/turbine/">Turbine</a> application framework.
-Contributions towards updating the information below can be submitted to the 
+Contributions towards updating the information below can be submitted to the
 <a href="mailto:torque-dev@db.apache.org">Torque Dev mailing list</a>.
 </p>
 
@@ -39,7 +39,7 @@
 
 <p>
 This text is a description of integration of Sybase ASE as the target
-database in a TDK generated application.  
+database in a TDK generated application.
 </p>
 
 </section>
@@ -48,7 +48,7 @@
 
 <p>
 Sybase has a pure java jdbc driver, jConnect, that is free to use, but not
-open source.  You may download this driver from 
+open source.  You may download this driver from
 <a href="http://www.sybase.com/products/eaimiddleware/jconnectforjdbc/">Sybase</a>.
 </p>
 </section>
@@ -77,7 +77,7 @@
 The .sql files that the TDK build process generates files with the
 sql command terminated by a ; for use in the sql directive provided by
 the Ant build system.  These scripts will not work properly if run by
-hand via the 'isql' command. 
+hand via the 'isql' command.
 </LI>
 <LI>
 The .sql files to create the tables, do not correctly remove any

Modified: db/torque/runtime/trunk/xdocs/tutorial/index.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/xdocs/tutorial/index.xml?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/xdocs/tutorial/index.xml (original)
+++ db/torque/runtime/trunk/xdocs/tutorial/index.xml Wed Aug 24 05:38:09 2005
@@ -42,17 +42,17 @@
 </p>
 
 <p>
-  In this tutorial, it is assumed that you have experience 
+  In this tutorial, it is assumed that you have experience
   in programming in Java, and that you have some experience
   using JDBC (e.g. you should know what a jdbc driver and a
   connection URL is).
-  Although <a href="http://maven.apache.org/">Maven</a> 
-  is heavily used in this tutorial, it is not assumed that 
+  Although <a href="http://maven.apache.org/">Maven</a>
+  is heavily used in this tutorial, it is not assumed that
   you have any experience in using it.
 </p>
 
 <p>
-  For each step in the tutorial, user comments are available 
+  For each step in the tutorial, user comments are available
   in the
   <a href="http://wiki.apache.org/db-torque/">Torque Wiki</a>,
   see the links at the bottom of each page.
@@ -62,28 +62,28 @@
 </p>
 
 <p>
-  If you are using Torque for the first time, you should 
+  If you are using Torque for the first time, you should
   stick very closely to the example provided in the Tutorial,
-  and get the sample application running as is. 
-  If you play around, there are quite a few places where 
+  and get the sample application running as is.
+  If you play around, there are quite a few places where
   things can go wrong, and is not always clear why they go wrong.
   Errors are much easier to find when you can pinpoint
-  the source of the error by 
+  the source of the error by
   &quot;Ok, it went wrong when I changed foo&quot;.<br />
-  Once you got a running example, you can (and should) still 
-  play around to see whether Torque can satisfy your particular 
+  Once you got a running example, you can (and should) still
+  play around to see whether Torque can satisfy your particular
   needs.
 </p>
 
 <p>
   The example used throughout this tutorial is based on an
-  email sent to the turbine-user mailing list by 
+  email sent to the turbine-user mailing list by
   Steven F. Davis called
   <a href="http://mail-archives.apache.org/mod_mbox/jakarta-turbine-user/200109.mbox/%3cBCAC8D6E905D234C84A49D1524A19CD1044FF7@bemail.BEDOMAIN.BEAP.COM%3e">
   torque outside turbine - detailed example (long)</a>.
   It has subsequently been updated for Turbine 3.1 which
   separates the <a href="../generator/">generator</a> from
-  the <a href="../">runtime</a> and provides a 
+  the <a href="../">runtime</a> and provides a
   <a href="../maven-plugin/">maven-plugin</a> for executing
   the generator using <a href="http://maven.apache.org/">
   Maven</a>.
@@ -101,7 +101,7 @@
 
 <section name="User Comments">
   <a href="http://wiki.apache.org/db-torque/TutorialUserComments">User comments</a>
-  for the tutorial as a whole and this page  
+  for the tutorial as a whole and this page
 </section>
 
   </body>

Modified: db/torque/runtime/trunk/xdocs/tutorial/step1.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/xdocs/tutorial/step1.xml?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/xdocs/tutorial/step1.xml (original)
+++ db/torque/runtime/trunk/xdocs/tutorial/step1.xml Wed Aug 24 05:38:09 2005
@@ -32,15 +32,15 @@
     <li>
       The generator generates your persistence classes from an xml
       description of the database. It also generates and executes
-      sql scripts to create all the necessary tables, constraints etc. 
-      in your database. 
-      The generator comes packaged in two jars: The templates in 
+      sql scripts to create all the necessary tables, constraints etc.
+      in your database.
+      The generator comes packaged in two jars: The templates in
       torque-gen-templates.jar, and the rest in torque-gen.jar.
     </li>
     <li>
-      The maven plugin integrates the generator into 
-      <a href="http://maven.apache.org/">Maven</a>, a software 
-      project management tool. In other words, the maven plugin is 
+      The maven plugin integrates the generator into
+      <a href="http://maven.apache.org/">Maven</a>, a software
+      project management tool. In other words, the maven plugin is
       a frontend for the generator.
     </li>
     <li>
@@ -48,22 +48,22 @@
       to work properly.
     </li>
   </ul>
-  For this tutorial, we will be using the maven plugin for Torque 3.2.x 
+  For this tutorial, we will be using the maven plugin for Torque 3.2.x
   (which will silently invoke the generator) to
-  generate our object model classes and sql scripts. For working with the 
+  generate our object model classes and sql scripts. For working with the
   generated classes, we will use the Torque 3.2.x runtime for our
   sample application.
 </p>
 
 <p>
-  If you have not already done so, download and install 
-  <a href="http://maven.apache.org/">Maven</a>. It is highly recommended to use

+  If you have not already done so, download and install
+  <a href="http://maven.apache.org/">Maven</a>. It is highly recommended to use
   version 1.0.2 of Maven.
 </p>
 
 <p>
   Maven uses the <a href="http://www.ibiblio.org/maven">ibiblio maven repository</a>
-  to download any libraries and resources it needs. From there, obtain the Torque 
+  to download any libraries and resources it needs. From there, obtain the Torque
   maven plugin by typing
 </p>
 
@@ -72,8 +72,8 @@
 ]]></source>
 
 <p>
-  You do not need to download the generator or the 
-  runtime separately. Maven will download them from 
+  You do not need to download the generator or the
+  runtime separately. Maven will download them from
   the ibiblio distribution site automatically
   when they are needed.
 </p>

Modified: db/torque/runtime/trunk/xdocs/tutorial/step2.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/xdocs/tutorial/step2.xml?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/xdocs/tutorial/step2.xml (original)
+++ db/torque/runtime/trunk/xdocs/tutorial/step2.xml Wed Aug 24 05:38:09 2005
@@ -42,18 +42,18 @@
   create/edit the Torque generator properties file
   (which is providing the generator with the
   necessary information)
-  and the Torque database schema file(s) 
+  and the Torque database schema file(s)
   (which contain the structure of your database).
   Each of these files is covered in the
   following sections.
 </p>
 
 <p>
-  As a starting point, create a directory as a 
-  base directory for your project (also called 
+  As a starting point, create a directory as a
+  base directory for your project (also called
   the project's top level directory),
   and change into that directory.
-  All the paths in the following steps will be 
+  All the paths in the following steps will be
   relative to this base directory.
 </p>
 
@@ -65,9 +65,9 @@
   The Torque generator literally generates Java
   source/class files representing your object model,
   SQL statements for your specific database, and
-  documentation.  
+  documentation.
   You configure the generator by setting properties in the
-  <em>project.properties</em> file in root directory of your 
+  <em>project.properties</em> file in root directory of your
   project.  As a starting point, use the following template
   and edit it to reflect your specific needs
 </p>
@@ -82,7 +82,7 @@
   # The target package to put the generated classes in.
   torque.targetPackage = com.kazmier.om
 
-  # The JDBC URL that Torque can use to create and 
+  # The JDBC URL that Torque can use to create and
   # drop databases if instructed to do so.
   torque.database.createUrl = jdbc:mysql://127.0.0.1/mysql
 
@@ -95,7 +95,7 @@
   # The JDBC database driver to use when connecting to your database.
   torque.database.driver = org.gjt.mm.mysql.Driver
 
-  # The administrative username that has sufficient privileges to create 
+  # The administrative username that has sufficient privileges to create
   # and drop databases and tables that Torque executes at generation time.
   torque.database.user = adminuser
 
@@ -117,7 +117,7 @@
 
 <p>
   For a reference as to what each property, and others, controls, please
-  see the <a href="../generator/properties-reference.html">properties 
+  see the <a href="../generator/properties-reference.html">properties
   reference</a> for the Torque generator.
 </p>
 
@@ -128,8 +128,8 @@
 <p>
   The second file that you must edit to configure
   Torque is the database schema.  The database schema
-  is an XML file that represents the structure of your 
-  SQL database in Torque.  
+  is an XML file that represents the structure of your
+  SQL database in Torque.
   This is where you define all of your
   tables, column names and types, as well as the keys
   used to index these tables.
@@ -153,7 +153,7 @@
 </p>
 
 <p>
-  In this tutorial, we will use a simple 
+  In this tutorial, we will use a simple
   database that might be used to support a bookstore
   application.  The database will contain three
   tables: author, publisher, and book.  The first
@@ -163,9 +163,9 @@
   table will contain book information (title, and
   ISBN).  The author id and publisher id will be
   foreign keys in the book table.  The schema
-  representation for this database is stored 
-  in the file <em>project-schema.xml</em>, which should 
-  be created in the <em>src/schema</em> directory 
+  representation for this database is stored
+  in the file <em>project-schema.xml</em>, which should
+  be created in the <em>src/schema</em> directory
   and contain the following:
 </p>
 
@@ -335,7 +335,7 @@
 
 <p>
   To initialize the IDBroker service, create a file
-  called <em>id-table-schema.xml</em> in the 
+  called <em>id-table-schema.xml</em> in the
   <em>src/schema</em> subdirectory of your project's
   base directory. It should have the following contents:
 </p>
@@ -372,7 +372,7 @@
 <p>
   Note that again, the <em>name</em> attribute to the
   <em>database</em> element has the same value as in the
-  <em>project-schema.xml</em>.  
+  <em>project-schema.xml</em>.
 </p>
 
 <p>
@@ -388,8 +388,8 @@
 <section name="Where to next">
 
   <p>
-    That completes the configuration of the Torque generator.  
-    You are now ready to start building your object model 
+    That completes the configuration of the Torque generator.
+    You are now ready to start building your object model
     and creating your database.
   </p>
   <p>

Modified: db/torque/runtime/trunk/xdocs/tutorial/step3.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/xdocs/tutorial/step3.xml?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/xdocs/tutorial/step3.xml (original)
+++ db/torque/runtime/trunk/xdocs/tutorial/step3.xml Wed Aug 24 05:38:09 2005
@@ -37,11 +37,11 @@
 </p>
 
 <p>
-  Note: If you are yet to jump aboard the Maven ship you can 
-  download the torque-gen archive and make use of the Ant build 
+  Note: If you are yet to jump aboard the Maven ship you can
+  download the torque-gen archive and make use of the Ant build
   file <code>build-torque.xml</code> contained therein. Some hints
-  about this can be found in the 
-  <a href="../user-guide.html#Generator_with_the_Ant_build_file">User Guide</a>.

+  about this can be found in the
+  <a href="../user-guide.html#Generator_with_the_Ant_build_file">User Guide</a>.
 </p>
 
 </section>
@@ -85,9 +85,9 @@
 </p>
 
 <p>
-  The generated Java classes are located in the 
-  <em>src/java</em> directory and will be in a 
-  directory hierarchy matching that of the 
+  The generated Java classes are located in the
+  <em>src/java</em> directory and will be in a
+  directory hierarchy matching that of the
   <code>torque.targetPackage</code> you
   specified in <em>project.properties</em>.
   These are the files that will be compiled into your
@@ -95,8 +95,8 @@
 </p>
 
 <p>
-  The generated SQL files are located in the 
-  <em>target/sql</em> directory.  
+  The generated SQL files are located in the
+  <em>target/sql</em> directory.
   For each database schema in your
   <em>src/schema</em> directory, there will be a
   corresponding file with a <em>.sql</em> extension
@@ -108,11 +108,11 @@
 
 <p>
   To change the directory where the classes are generated,
-  use the properties <code>torque.home</code>, 
+  use the properties <code>torque.home</code>,
   <code>torque.output.dir</code>
   and/or <code>torque.java.dir</code>
   in your <code>project.properties</code> file - see
-  the <a href="../generator/properties-reference.html">properties 
+  the <a href="../generator/properties-reference.html">properties
   reference</a> for more detail).
 </p>
 
@@ -137,7 +137,7 @@
   defined in <em>project.properties</em>) is in your
   classpath so that Torque can connect to your
   database and execute the generated SQL commands.
-  The easiest way to accomplish this is to add the 
+  The easiest way to accomplish this is to add the
   database driver jar to your local maven repository,
   and specify it as a dependency in your project.
   This is done as follows:
@@ -146,11 +146,11 @@
 <subsection name="Adding the driver to the maven repository">
 
 <p>
-  For licensing reasons, most database drivers cannot 
+  For licensing reasons, most database drivers cannot
   be downloaded automatically by maven. Therefore,
-  you have to add the driver manually to your local maven 
+  you have to add the driver manually to your local maven
   repository. The local maven repository
-  is located by default in the directory 
+  is located by default in the directory
   <em>%HOMEDRIVE%%HOMEPATH%\.maven\repository</em>
   in windows, and <em>$HOME/.maven/repository</em>
   in linux/unix. Change into that direcory and
@@ -158,7 +158,7 @@
   where <em>${groupId}</em> is typically set to
   the name of the database (for example, use
   <em>mysql/jars</em> for mysql).
-  Then, download the database driver, and copy the 
+  Then, download the database driver, and copy the
   driver jar to the subdirectory you just created.
 </p>
 
@@ -167,14 +167,14 @@
 <subsection name="Specifying the driver dependency">
 
 <p>
-  The dependencies of a project are specified 
-  in a file named <em>project.xml</em> in the 
+  The dependencies of a project are specified
+  in a file named <em>project.xml</em> in the
   top level directory of your project.
   (This is not the only use of this file,
-  see the 
+  see the
   <a href="http://maven.apache.org/start/ten-minute-test.html">
   maven getting started guide</a>
-  and the 
+  and the
   <a href="http://maven.apache.org/reference/project-descriptor.html">
   Maven Project descriptor reference</a> for more
   information.)
@@ -182,9 +182,9 @@
 
 <p>
   If you did not create a <em>project.xml</em> file yet,
-  create it in the top level directory of your project 
+  create it in the top level directory of your project
   and fill it using the following template. (If you
-  already have a <em>project.xml</em>, 
+  already have a <em>project.xml</em>,
   just add the dependency.)
 </p>
 
@@ -207,25 +207,25 @@
 ]]></source>
 
 <p>
-  Replace the variables ${driverJarName}, 
-  ${databaseName}, and ${driverVersion} by the values 
-  needed to locate the driver jar. These variable 
+  Replace the variables ${driverJarName},
+  ${databaseName}, and ${driverVersion} by the values
+  needed to locate the driver jar. These variable
   must be chosen such that using the path
-  <em>${repo}/${groupId}/${type}s/${artifactId}-${version}.${type}</em> 
+  <em>${repo}/${groupId}/${type}s/${artifactId}-${version}.${type}</em>
   points to the driver jar you copied into the
   local maven repository.
-  Here, <em>${repo}</em> is the path to the 
-  local maven repository, ${type} is set to 
-  <code>jar</code> by default, and the other variables 
+  Here, <em>${repo}</em> is the path to the
+  local maven repository, ${type} is set to
+  <code>jar</code> by default, and the other variables
   are set in the <em>project.xml</em>.
   If the name of the driver jar cannot be expressed as
-  <em>${artifactId}-${version}.${type}</em>, rename 
+  <em>${artifactId}-${version}.${type}</em>, rename
   the driver jar in yor local maven repository.
 </p>
 
 <p>
   For example, if the downloaded driver was put into the local
-  repository as 
+  repository as
   <em>mysql/jars/mysql-connector-java-3.1.6-bin.jar</em>,
   <code>${artifactId}</code> would be set to
   <code>mysql-connector-java</code>,
@@ -258,22 +258,22 @@
 ]]></source>
 
 <p>
-  Note that creating the database might not work 
+  Note that creating the database might not work
   for some databases at all (e.g. oracle).
-  Also, for other databases (e.g. mysql), 
-  the database user must be database administrator 
+  Also, for other databases (e.g. mysql),
+  the database user must be database administrator
   to be able to create the database, and often
   (e.g. mysql, postgresql), one must connect to a
   database which is different from the database
-  which one wants to create (this is why there are 
-  different properties 
+  which one wants to create (this is why there are
+  different properties
   <code>torque.database.createUrl</code>
   and <code>torque.database.buildUrl</code>
-  in the <em>project.properties</em> 
+  in the <em>project.properties</em>
   for creating the database and the tables,
-  respectively).<br /> 
-  If you encounter problems in this step, 
-  you might want to skip it 
+  respectively).<br />
+  If you encounter problems in this step,
+  you might want to skip it
   and create the database manually.
 </p>
 

Modified: db/torque/runtime/trunk/xdocs/tutorial/step4.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/xdocs/tutorial/step4.xml?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/xdocs/tutorial/step4.xml (original)
+++ db/torque/runtime/trunk/xdocs/tutorial/step4.xml Wed Aug 24 05:38:09 2005
@@ -27,18 +27,18 @@
 <section name="Step 4: Configuring the Torque Runtime">
 
 <p>
-  Before we can start to write a Torque application, we have to 
+  Before we can start to write a Torque application, we have to
   configure the runtime environment:
   <ul>
     <li>
-      We have to make sure that the generated 
-      object model classes have access to the Torque 
+      We have to make sure that the generated
+      object model classes have access to the Torque
       runtime and associated libraries.
     </li>
     <li>
       The Torque runtime needs a configuration file
-      in order to retrieve the data which is necessary 
-      to connect to the database. 
+      in order to retrieve the data which is necessary
+      to connect to the database.
     </li>
   </ul>
   These two steps will be covered in the following sections.
@@ -46,14 +46,14 @@
 
 </section>
 
-<section name="Setting up the classpath">  
-  
+<section name="Setting up the classpath">
+
 <p>
-  The libraries which the generated classes depend on 
+  The libraries which the generated classes depend on
   are specified in the file <em>project.xml</em>
   in the top level directory of the project.
-  You already created this file in step 3 of the 
-  tutorial; now it needs to be extended a bit.  
+  You already created this file in step 3 of the
+  tutorial; now it needs to be extended a bit.
   Assuming that you use JDK 1.4+, you need to add
   the following entries to the &lt;dependencies&gt;
   section of your <em>project.xml</em>
@@ -124,7 +124,7 @@
       <groupId>village</groupId>
       <version>2.0-dev-20030825</version>
     </dependency>
-    
+
     <dependency>
       <artifactId>xercesImpl</artifactId>
       <groupId>xerces</groupId>
@@ -136,19 +136,19 @@
       <groupId>xml-apis</groupId>
       <version>2.0.2</version>
     </dependency>
-    
+
 ]]></source>
 
 <p>
-  You need not download any of these libraries - 
-  Maven will download them automatically when you 
+  You need not download any of these libraries -
+  Maven will download them automatically when you
   build your project.
 </p>
 
 <p>
   <b>
     Note: There is no need to include the torque-gen jar file in your project
-    classpath, including it may adversly affect the logging configuration of 
+    classpath, including it may adversly affect the logging configuration of
     your application.
   </b>
 </p>
@@ -158,7 +158,7 @@
 <section name="Torque Run-Time Properties">
 
 <p>
-  The second step in the configuration of the 
+  The second step in the configuration of the
   Torque Runtime are the
   Torque run-time properties.  As the name suggests,
   these properties are used when your application is
@@ -172,11 +172,11 @@
 </p>
 
 <p>
-  We will save our runtime properties in the 
+  We will save our runtime properties in the
   a file called <em>torque.properties</em>.
   Create a subdirectory src/conf in the
   top-level directory of your project, and create
-  a new file called <em>torque.properties</em> 
+  a new file called <em>torque.properties</em>
   in it. Add the following lines to this file:
 </p>
 
@@ -273,23 +273,23 @@
 <section name="Logging configuration">
 
   <p>
-    Torque uses 
+    Torque uses
     <a href="http://jakarta.apache.org/commons/logging/">
     commons-logging</a> as a logging interface.
-    To enable logging in your application, read the 
+    To enable logging in your application, read the
     <a href="http://jakarta.apache.org/commons/logging/commons-logging-1.0.3/usersguide.html">
     commons-logging user guide</a>.
   </p>
-  
+
   <p>
     If you have no trouble running the tutorial,
     you do not need to configure logging now. If, however,
-    you experience runtime errors later on 
-    and do not find the reason immediately, 
-    it might be a good idea to configure 
-    logging and look at the log messages. Also, for a 
-    &quot;serious&quot; application, logging is 
-    indispensible in order to track down any 
+    you experience runtime errors later on
+    and do not find the reason immediately,
+    it might be a good idea to configure
+    logging and look at the log messages. Also, for a
+    &quot;serious&quot; application, logging is
+    indispensible in order to track down any
     unexpected errors.
   </p>
 

Modified: db/torque/runtime/trunk/xdocs/tutorial/step6.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/xdocs/tutorial/step6.xml?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/xdocs/tutorial/step6.xml (original)
+++ db/torque/runtime/trunk/xdocs/tutorial/step6.xml Wed Aug 24 05:38:09 2005
@@ -33,10 +33,10 @@
   Now that you've generated your object model with
   Torque, and created a sample application, you are
   now ready to compile everything.  Again, Maven is used
-  to control the build process.  
+  to control the build process.
 </p>
 <p>
-  First, we need to tell maven where the java source 
+  First, we need to tell maven where the java source
   files are located. To do this, add the following section
   just after the <code>&lt;dependencies&gt;</code> of your
   <em>project.xml</em> which you created sooner on in the
@@ -49,9 +49,9 @@
   </build>
 ]]></source>
 
-<p>  
+<p>
   Afterwards, you can compile your jave source files
-  by typing the following in the top-level directory 
+  by typing the following in the top-level directory
   of your project:
 </p>
 
@@ -64,8 +64,8 @@
   build without any errors.  All of the resulting Java
   class files are placed in the
   <em>target/classes</em> directory.  If the compiler
-  misses any external libraries, review the 
-  &lt;dependencies&gt; section in your 
+  misses any external libraries, review the
+  &lt;dependencies&gt; section in your
   <em>project.xml</em>.  Should you
   encounter other errors, go back and review your
   application code.
@@ -83,22 +83,22 @@
   jars denoted in the &lt;dependencies&gt; section
   of your <em>project.xml</em>, and all of your
   application and object model classes located in
-  <em>target/classes</em>.  
+  <em>target/classes</em>.
 </p>
 
 <p>
-  Before compiling your application, 
+  Before compiling your application,
   maven will have downloaded all libraries
   your project depends on to the local maven repository.
   Gathering them from there is a cumbersome process.
-  To ease copying them into one place, we modify 
+  To ease copying them into one place, we modify
   Maven's build process a little.
   For this, you need to create a new file called
-  <em>maven.xml</em> in the top-level directory 
-  of your project. It needs to have the 
+  <em>maven.xml</em> in the top-level directory
+  of your project. It needs to have the
   following content:
 </p>
-  
+
 <source><![CDATA[
 <project xmlns:java="java" xmlns:deploy="deploy">
   <postGoal name="java:compile">
@@ -119,15 +119,15 @@
 ]]></source>
 
 <p>
-  Now change into the target directory. In addition 
-  to the <em>classes</em> subdirectory which was 
+  Now change into the target directory. In addition
+  to the <em>classes</em> subdirectory which was
   already created in the first compilation run,
   you see that maven has generated an additional
-  <em>lib</em> directory which contains the needed 
+  <em>lib</em> directory which contains the needed
   libraries, and that maven also copied the
   Torque.properties file here.
 </p>
-  
+
 <p>
   Now everything is in one place, and you can start the
   application by typing
@@ -176,7 +176,7 @@
 
   Booklist (should be empty):
 ]]></source>
-  
+
 <p>
   If your application throws an exception, it could be
   for one of many reasons, most of which are not very

Modified: db/torque/runtime/trunk/xdocs/user-guide.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/xdocs/user-guide.xml?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/xdocs/user-guide.xml (original)
+++ db/torque/runtime/trunk/xdocs/user-guide.xml Wed Aug 24 05:38:09 2005
@@ -63,14 +63,14 @@
   Torque consists of two main components:
   <ul>
     <li>
-      <a href="/generator/">Generator</a> - The Torque generator uses a single
XML 
-      database schema file to generate the SQL for your target database and 
-      Torque's Peer-based object relational model.  The generator can be 
-      executed using the Torque <a href="/maven-plugin/">maven-plugin</a> or

+      <a href="/generator/">Generator</a> - The Torque generator uses a single
XML
+      database schema file to generate the SQL for your target database and
+      Torque's Peer-based object relational model.  The generator can be
+      executed using the Torque <a href="/maven-plugin/">maven-plugin</a> or
       an <a href="http://ant.apache.org/">Ant</a> build file.
     </li>
     <li>
-      <a href="/">Runtime</a> - The Torque runtime is required in order to 
+      <a href="/">Runtime</a> - The Torque runtime is required in order to
       compile and use of the classes produced by the generator.
     </li>
   </ul>
@@ -83,10 +83,10 @@
 <subsection name="Generator with the Maven plugin">
 
 <p>
-  If you have not already done so, download and install 
-  <a href="http://maven.apache.org/">Maven</a>.  You then need to obtain the

-  Torque maven plugin.  The <a href="../maven-howto.html">Maven Howto</a> 
-  includes details of how to build the maven plugin from source, but you can 
+  If you have not already done so, download and install
+  <a href="http://maven.apache.org/">Maven</a>.  You then need to obtain the
+  Torque maven plugin.  The <a href="../maven-howto.html">Maven Howto</a>
+  includes details of how to build the maven plugin from source, but you can
   easily install a binary distribution thus:
 </p>
 
@@ -100,26 +100,26 @@
 <subsection name="Generator with the Ant build file">
 
 <p>
-  If you prefer to use <a href="http://ant.apache.org/">Ant</a> you need access

-  to the Torque generator distribution and associated libraries - these are 
-  available from the 
+  If you prefer to use <a href="http://ant.apache.org/">Ant</a> you need access
+  to the Torque generator distribution and associated libraries - these are
+  available from the
   <a href="http://jakarta.apache.org/builds/jakarta-turbine/torque/release/3.2-rc1/">
-  Downloads page</a> (the file to download is torque-gen-3.2-rc1.tar.gz or 
+  Downloads page</a> (the file to download is torque-gen-3.2-rc1.tar.gz or
   torque-gen-3.2-rc1.zip, depending on your development platform).  Unpack the
   archive to reveal the following directory structure:
 </p>
 
 <source><![CDATA[
 torque-gen-3.1.1/
-    docs/              <--- Contains a copy of the Torque documentation, 
+    docs/              <--- Contains a copy of the Torque documentation,
                             including the API JavaDocs.
-    lib/               <--- Contains the jar files required by the Torque 
+    lib/               <--- Contains the jar files required by the Torque
                             generator, including the torque-gen-templates
-                            jar containing the templates. If you want to 
-                            modify the templates, you can unpack the 
-                            templates jar, set the 
-                            <code>torque.useClasspath</code> to 
-                            <code>false</code> 
+                            jar containing the templates. If you want to
+                            modify the templates, you can unpack the
+                            templates jar, set the
+                            <code>torque.useClasspath</code> to
+                            <code>false</code>
                             and the <code>torque.schema.dir</code>
                             to the correct directory in the
                             <code>build.properties</code>
@@ -127,7 +127,7 @@
                             IDBroker.
     build.properties   <--- The various properties that you use to configure
                             the Torque generator.
-    build-torque.xml   <--- The Ant build file containing the various torque 
+    build-torque.xml   <--- The Ant build file containing the various torque
                             goals.
     default.properties <--- The default property values that are used to
                             configure the Torque generator.
@@ -137,10 +137,10 @@
 ]]></source>
 
 <p>
-  The instructions below are targeted towards using the Torque maven-plugin.  
-  If you are using Ant the instructions are basically the same, but instead of 
+  The instructions below are targeted towards using the Torque maven-plugin.
+  If you are using Ant the instructions are basically the same, but instead of
   using <code>project.properties</code> you use <code>build.properties</code>
-  and instead of using <code>maven torque:${goal-name}</code> you use 
+  and instead of using <code>maven torque:${goal-name}</code> you use
   <code>ant -f build-torque.xml ${target-name}</code>.
 </p>
 
@@ -149,10 +149,10 @@
 <subsection name="Runtime">
 
 <p>
-  At runtime the generated object model classes need access to the Torque 
+  At runtime the generated object model classes need access to the Torque
   runtime distribution and associated libraries - these are available from the
   <a href="http://jakarta.apache.org/builds/jakarta-turbine/torque/release/3.1.1/">
-  Downloads page</a> (the file to download is torque-3.1.1.tar.gz or 
+  Downloads page</a> (the file to download is torque-3.1.1.tar.gz or
   torque-3.1.1.zip, depending on your development platform).  We will cover
   what to do with this file in a later step.
 </p>
@@ -270,9 +270,9 @@
 <subsection name="Torque Runtime Configuration (Torque.properties)">
 
 <p>
-  The runtime distribution archive includes an Ant build file that can be used 
+  The runtime distribution archive includes an Ant build file that can be used
   to generate your Torque runtime configuration - see the Torque
-  <a href="tutorial/step2.html#Torque_Run-Time_Properties">tutSorial</a> for

+  <a href="tutorial/step2.html#Torque_Run-Time_Properties">tutSorial</a> for
   details.
 </p>
 
@@ -280,7 +280,7 @@
 torque.database.default = my_project
 torque.database.my_project.adapter = mysql
 
-# Using commons-dbcp 
+# Using commons-dbcp
 torque.dsfactory.my_project.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
 torque.dsfactory.my_project.connection.driver = org.gjt.mm.mysql.Driver
 torque.dsfactory.my_project.connection.url = jdbc:mysql://localhost:3306/my_project
@@ -289,7 +289,7 @@
   ]]></source>
 
   <p>
-    The above example uses the commons-dbcp connection pool - see 
+    The above example uses the commons-dbcp connection pool - see
     <a href="configuration-howto.html">Pool-config Howto</a>
     details of the available <code>DataSource</code> factories.
   </p>
@@ -299,12 +299,12 @@
 <subsection name="Add Libraries">
 
   <p>
-    In order to be able to compile and use the generated class files it is 
+    In order to be able to compile and use the generated class files it is
     necessary to include the Torque runtime jar file and jar files for all of
-    the necessary dependencies in the classpath of your project.  The necessary 
+    the necessary dependencies in the classpath of your project.  The necessary
     jars are included in the <code>torque/lib</code> directory of the Torque
     runtime.  If you are using Maven to build your project it may be easiest to
-    copy the necessary <a href="../dependencies.html">dependencies</a> from the

+    copy the necessary <a href="../dependencies.html">dependencies</a> from the
     <a href="http://cvs.apache.org/viewcvs.cgi/db-torque/project.xml?only_with_tag=TORQUE_3_1_BRANCH">Torque
     runtime POM</a>.
   </p>



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message