Initial Import

Author: clinton.begin

docs/dataAccessGuide/resources/IBatisNet.vsd renamed to Documentation/dataAccessGuide/resources/IBatisNet.vsd

@@ -50,19 +50,12 @@
         </thead>
 
         <tbody>
-		
-		 <row>
-            
-			<entry>DomDaoManagerBuilder</entry>
+          <row>
+            <entry>DaoManager (Facade)</entry>
 
             <entry>Responsible for configuration of the DAO framework (via
-            dao.config), instantiating DAO implementations and IDaoManager instances.</entry>
-          </row>
-
-		<row>
-			<entry>IDaoManager (Facade)</entry>
-
-            <entry>Acting as a façade to the rest of the API.</entry>
+            dao.config), instantiating DAO implementations, and acting as a
+            façade to the rest of the API.</entry>
           </row>
 
           <row>

Documentation/dataAccessGuide/src/en/configuration.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="example">
+  <title>Examples</title>
+	<sect1>
+		<title>NPetshop Application</title>
+		<para>For a complete example of using the DAO Framework, please visit
+    <ulink url="http://incubator.apache.org/ibatis/">http://incubator.apache.org/ibatis/</ulink>
+    and download the NPetshop demo application. Have fun!</para>	
+   </sect1>
+</chapter>  

docs/dataAccessGuide/src/en/dao.xml renamed to Documentation/dataAccessGuide/src/en/dao.xml

@@ -17,11 +17,9 @@
     <para>This implementation uses ADO.NET to provide a connection and
     transaction via the ADO.NET API.</para>
 
-    <example>
-      <title>Example Simple DAO Session Handler configuration</title>
-
-      <programlisting>&lt;context id="<emphasis role="blue">SimpleDao</emphasis>" default="<emphasis
-          role="blue">true</emphasis>"&gt;
+    <example><title>Example Simple DAO Session Handler configuration</title>
+    <programlisting>&lt;context id="<emphasis role="blue">SimpleDao</emphasis>" default="<emphasis
+        role="blue">true</emphasis>"&gt;
   &lt;properties resource="<emphasis role="blue">database.config</emphasis>"/&gt;
 
   &lt;database&gt;
@@ -38,8 +36,7 @@
     &lt;dao interface="<emphasis role="blue">IBatisNet.Test.Dao.Interfaces.IAccountDao, IBatisNet.Test</emphasis>"
          implementation="<emphasis role="blue">IBatisNet.Test.Dao.Implementations.Ado.AccountDao, IBatisNet.Test</emphasis>"/&gt;
   &lt;/daoFactory&gt;
-&lt;/context&gt;</programlisting>
-    </example>
+&lt;/context&gt;</programlisting></example>
 
     <para></para>
   </sect1>
@@ -49,13 +46,10 @@
 
     <para>The SqlMap session handler implementation wraps iBATIS Data Mapper
     SqlMapper session management services for simple use via the DAO
-    framework. All you need to specify is the SqlMap configuration
-    file.</para>
-
-    <example>
-      <title>Example SqlMap DAO Session Handler configuration</title>
+    framework. All you need to specify is the SqlMap configuration file.</para>
 
-      <programlisting>&lt;context id="<emphasis role="blue">SqlMapDao</emphasis>"&gt;
+    <example><title>Example SqlMap DAO Session Handler configuration</title>
+    <programlisting>&lt;context id="<emphasis role="blue">SqlMapDao</emphasis>"&gt;
   &lt;properties resource="<emphasis role="blue">database.config</emphasis>"/&gt;
 
   &lt;database&gt;
@@ -66,15 +60,14 @@
   &lt;/database&gt;
 
   &lt;daoSessionHandler id="SqlMap"&gt;
-    &lt;property name="resource" value="<emphasis role="blue">SqlMap.config</emphasis>"/&gt;
+    &lt;property name="sqlMapConfigFile" value="<emphasis role="blue">SqlMap.config</emphasis>"/&gt;
   &lt;/daoSessionHandler&gt;
 
   &lt;daoFactory&gt;
     &lt;dao interface="<emphasis role="blue">IBatisNet.Test.Dao.Interfaces.IAccountDao, IBatisNet.Test</emphasis>" 
          implementation="<emphasis role="blue">IBatisNet.Test.Dao.Implementations.DataMapper.AccountDao, IBatisNet.Test"</emphasis>/&gt;
  &lt;/daoFactory&gt;
-&lt;/context&gt;</programlisting>
-    </example>
+&lt;/context&gt;</programlisting></example>
 
     <para></para>
   </sect1>
@@ -88,10 +81,8 @@
     configuration are the same as those that would normally be specified in an
     NHibernate configuration section. Here is an example configuration:</para>
 
-    <example>
-      <title>Example NHibernate DAO Session Handler configuration</title>
-
-      <programlisting>&lt;context id="<emphasis role="blue">NHibernateDao</emphasis>"&gt;
+    <example><title>Example NHibernate DAO Session Handler configuration</title>
+    <programlisting>&lt;context id="<emphasis role="blue">NHibernateDao</emphasis>"&gt;
   &lt;properties resource="<emphasis role="blue">database.config</emphasis>"/&gt;
 
   &lt;database&gt;
@@ -117,7 +108,6 @@
     &lt;dao interface="<emphasis role="blue">IBatisNet.Test.Dao.Interfaces.IAccountDao, IBatisNet.Test</emphasis>" 
          implementation="<emphasis role="blue">IBatisNet.Test.Dao.Implementations.DataMapper.AccountDao, IBatisNet.Test</emphasis>"/&gt;
   &lt;/daoFactory&gt;
-&lt;/context&gt;</programlisting>
-    </example>
+&lt;/context&gt;</programlisting></example>
   </sect1>
 </chapter>

Documentation/dataAccessGuide/src/en/example.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "../../../docbook/docbook-dtd/docbookx.dtd" [
+<!ENTITY introduction SYSTEM "introduction.xml">
+<!ENTITY dao SYSTEM "dao.xml">
+<!ENTITY configuration SYSTEM "configuration.xml">
+<!ENTITY handler SYSTEM "handler.xml">
+<!ENTITY programming SYSTEM "programming.xml">
+<!ENTITY interface SYSTEM "interface.xml">
+<!ENTITY example	SYSTEM "example.xml">
+<!ENTITY xsd        SYSTEM "xsd.xml">
+]>
+<book>
+  <bookinfo>
+    <title>iBATIS.NET - .NET Application Framework</title>
+    <subtitle>Data Access Objects Developer Guide</subtitle>
+    <releaseinfo>Version 1.5</releaseinfo>
+    <pubdate>01-01-2004</pubdate>
+    <authorgroup>
+      <author>
+        <firstname>Gilles</firstname>
+        <surname>Bayon</surname>
+      </author>
+      <author>
+        <firstname>Clinton</firstname>
+        <surname>Begin</surname>
+      </author>
+      <author>
+        <firstname>Roberto</firstname>
+        <surname>Rabe</surname>
+      </author>
+    </authorgroup>
+
+    <legalnotice>
+      <para>Copies of this document may be made for your own use and for
+      distribution to others, provided that you do not charge any fee for such
+      copies and further provided that each copy contains this Copyright
+      Notice, whether distributed in print or electronically.</para>
+    </legalnotice>
+  </bookinfo>
+
+  <toc></toc>
+
+  &introduction;
+  &dao;
+  &configuration;
+  &handler;
+  &programming;
+  &interface;
+  &example;
+  &xsd;
+
+</book>

docs/dataAccessGuide/src/en/handler.xml renamed to Documentation/dataAccessGuide/src/en/handler.xml

@@ -46,7 +46,9 @@ public interface IAccountDao : IDao {
         <imagedata align="center" fileref="images/DAODesign.gif" format="GIF" />
       </imageobject>
 
-      <caption><para>DAO Implementation Diagram</para></caption>
+      <caption>
+        <para>DAO Implementation Diagram</para>
+      </caption>
     </mediaobject>
 
     <para>Notice that the <classname>BaseDao</classname> implements the
@@ -88,7 +90,7 @@ using IBatisNet.DataAccess.Interfaces; //IDao</emphasis>
 namespace IBatisNet.Test.Implementations {
  public class <emphasis role="blue">BaseDao: IDao</emphasis> {
   <emphasis role="blue">protected DaoSession GetContext()</emphasis> {
-   IDaoManager daoManager = DaoManager.GetInstance(this);
+   DaoManager daoManager = DaoManager.GetInstance(this);
    return (daoManager.LocalDaoSession as DaoSession);
   }
  }
@@ -225,7 +227,7 @@ using IBatisNet.Test.Domain; // Account</programlisting>
       <para>Now, let's let's see how this DAO's <methodname>Delete(Account
       account)</methodname> method uses the framework.</para>
 
-      <programlisting>  public void Delete(Account account) {
+      <programlisting>  public void Delete(Account account) {, DaoManager
 
    IDbCommand command = null;
    DaoSession daoSession = null;
@@ -252,7 +254,7 @@ using IBatisNet.Test.Domain; // Account</programlisting>
    }
   }</programlisting>
 
-      <para>The DAO obtains an instance of <classname>DaoSession</classname>
+      <para>The DAO obtain's an instance of <classname>DaoSession</classname>
       by calling the <methodname>GetContext</methodname> method inherited from
       <classname>BaseDao</classname>. Next, it uses the simple
       <classname>DaoSession</classname> to get a <varname>command</varname>
@@ -325,8 +327,8 @@ using IBatisNet.Test.Domain; // Account</programlisting>
 
       <para>After configuring the framework's
       <classname>DaoManager</classname> for either the ADO.NET or Data Mapper
-      <classname>AccountDao</classname> that we just created (see the
-      Configuration section), we can now look at how to use them.</para>
+      <classname>AccountDao</classname> we just created (see the Configuration
+      section), we can now look at how to use them.</para>
 
       <programlisting>using System;
 
@@ -335,13 +337,13 @@ using IBatisNet.DataAccess;
 using IBatisNet.Test.Dao.Interfaces;
 using IBatisNet.Test.Domain;
 
-namespace Examples.Services {
+namespace Examples.DaoUsage {
 
- public class AccountService {
+ public class AccountDaoUsage {
 
-  protected static IDaoManager daoManager = null;
+  protected static DaoManager daoManager = null;
 
-  static AccountService() {
+  static AccountDaoUsage() {
    daoManager = DaoManager.GetInstance();
   }
 
@@ -380,7 +382,7 @@ namespace Examples.Services {
       <classname>UserDao</classname> class.</para>
 
       <para>Like the <classname>SqlMapDaoSession</classname> handler, the
-      <classname>NHibernateDaoSession</classname> handler is found in the
+      <classname>NHibernateDaoSession</classname> handler is found in
       <classname>IBatisNet.DataAccess.Extensions.DaoSessionHandlers</classname>
       namespace.</para>