db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r307190 [2/2] - in /db/derby/site/trunk: build/site/ build/site/integrate/ build/site/integrate/plugin_help/ src/documentation/content/xdocs/ src/documentation/content/xdocs/integrate/
Date Fri, 07 Oct 2005 20:44:29 GMT
Modified: db/derby/site/trunk/build/site/integrate/plugin_help/remove_nature.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/remove_nature.html?rev=307190&r1=307189&r2=307190&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/remove_nature.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/remove_nature.html Fri Oct  7 13:44:21 2005
@@ -96,6 +96,9 @@
 <div class="menuitem">
 <a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
 </div>
+<div class="menuitem">
+<a href="../../integrate/db_torque.html">Torque</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Eclipse Plug-ins</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -109,18 +112,21 @@
 <a href="../../integrate/plugin_howto.html">10.1 Core and 1.1 UI</a>
 </div>
 <div class="menuitem">
+<a href="../../integrate/Readme.html">Building 1.1 UI</a>
+</div>
+<div class="menuitem">
 <a href="../../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.2.5', '../../skin/')" id="menu_selected_1.2.5Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_selected_1.2.5" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.2.6', '../../skin/')" id="menu_selected_1.2.6Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_selected_1.2.6" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/start_toc.html">Getting Started</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.2.5.3', '../../skin/')" id="menu_selected_1.2.5.3Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Derby Nature</div>
-<div id="menu_selected_1.2.5.3" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.2.6.3', '../../skin/')" id="menu_selected_1.2.6.3Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Derby Nature</div>
+<div id="menu_selected_1.2.6.3" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -131,8 +137,8 @@
 <div class="menupagetitle">Removing the Derby Nature</div>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.4', '../../skin/')" id="menu_1.2.5.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.2.5.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.4', '../../skin/')" id="menu_1.2.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.2.6.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -146,8 +152,8 @@
 <div class="menuitem">
 <a href="../../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.6', '../../skin/')" id="menu_1.2.5.6Title" class="menutitle">ij</div>
-<div id="menu_1.2.5.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.6', '../../skin/')" id="menu_1.2.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.2.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/resources.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/resources.html?rev=307190&r1=307189&r2=307190&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/resources.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/resources.html Fri Oct  7 13:44:21 2005
@@ -96,6 +96,9 @@
 <div class="menuitem">
 <a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
 </div>
+<div class="menuitem">
+<a href="../../integrate/db_torque.html">Torque</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Eclipse Plug-ins</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -109,18 +112,21 @@
 <a href="../../integrate/plugin_howto.html">10.1 Core and 1.1 UI</a>
 </div>
 <div class="menuitem">
+<a href="../../integrate/Readme.html">Building 1.1 UI</a>
+</div>
+<div class="menuitem">
 <a href="../../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.2.5', '../../skin/')" id="menu_selected_1.2.5Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_selected_1.2.5" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.2.6', '../../skin/')" id="menu_selected_1.2.6Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_selected_1.2.6" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/start_toc.html">Getting Started</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.3', '../../skin/')" id="menu_1.2.5.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.2.5.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.3', '../../skin/')" id="menu_1.2.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.2.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -131,8 +137,8 @@
 <a href="../../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.4', '../../skin/')" id="menu_1.2.5.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.2.5.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.4', '../../skin/')" id="menu_1.2.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.2.6.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -146,8 +152,8 @@
 <div class="menuitem">
 <a href="../../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.6', '../../skin/')" id="menu_1.2.5.6Title" class="menutitle">ij</div>
-<div id="menu_1.2.5.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.6', '../../skin/')" id="menu_1.2.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.2.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/server_toc.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/server_toc.html?rev=307190&r1=307189&r2=307190&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/server_toc.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/server_toc.html Fri Oct  7 13:44:21 2005
@@ -96,6 +96,9 @@
 <div class="menuitem">
 <a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
 </div>
+<div class="menuitem">
+<a href="../../integrate/db_torque.html">Torque</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Eclipse Plug-ins</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -109,18 +112,21 @@
 <a href="../../integrate/plugin_howto.html">10.1 Core and 1.1 UI</a>
 </div>
 <div class="menuitem">
+<a href="../../integrate/Readme.html">Building 1.1 UI</a>
+</div>
+<div class="menuitem">
 <a href="../../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.2.5', '../../skin/')" id="menu_selected_1.2.5Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_selected_1.2.5" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.2.6', '../../skin/')" id="menu_selected_1.2.6Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_selected_1.2.6" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/start_toc.html">Getting Started</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.3', '../../skin/')" id="menu_1.2.5.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.2.5.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.3', '../../skin/')" id="menu_1.2.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.2.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -131,8 +137,8 @@
 <a href="../../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.2.5.4', '../../skin/')" id="menu_selected_1.2.5.4Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Network Server</div>
-<div id="menu_selected_1.2.5.4" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.2.6.4', '../../skin/')" id="menu_selected_1.2.6.4Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Network Server</div>
+<div id="menu_selected_1.2.6.4" class="selectedmenuitemgroup" style="display: block;">
 <div class="menupage">
 <div class="menupagetitle">Starting and Stopping</div>
 </div>
@@ -146,8 +152,8 @@
 <div class="menuitem">
 <a href="../../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.6', '../../skin/')" id="menu_1.2.5.6Title" class="menutitle">ij</div>
-<div id="menu_1.2.5.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.6', '../../skin/')" id="menu_1.2.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.2.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/start_server.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/start_server.html?rev=307190&r1=307189&r2=307190&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/start_server.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/start_server.html Fri Oct  7 13:44:21 2005
@@ -96,6 +96,9 @@
 <div class="menuitem">
 <a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
 </div>
+<div class="menuitem">
+<a href="../../integrate/db_torque.html">Torque</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Eclipse Plug-ins</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -109,18 +112,21 @@
 <a href="../../integrate/plugin_howto.html">10.1 Core and 1.1 UI</a>
 </div>
 <div class="menuitem">
+<a href="../../integrate/Readme.html">Building 1.1 UI</a>
+</div>
+<div class="menuitem">
 <a href="../../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.2.5', '../../skin/')" id="menu_selected_1.2.5Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_selected_1.2.5" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.2.6', '../../skin/')" id="menu_selected_1.2.6Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_selected_1.2.6" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/start_toc.html">Getting Started</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.3', '../../skin/')" id="menu_1.2.5.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.2.5.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.3', '../../skin/')" id="menu_1.2.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.2.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -131,8 +137,8 @@
 <a href="../../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.2.5.4', '../../skin/')" id="menu_selected_1.2.5.4Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Network Server</div>
-<div id="menu_selected_1.2.5.4" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.2.6.4', '../../skin/')" id="menu_selected_1.2.6.4Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Network Server</div>
+<div id="menu_selected_1.2.6.4" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -146,8 +152,8 @@
 <div class="menuitem">
 <a href="../../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.6', '../../skin/')" id="menu_1.2.5.6Title" class="menutitle">ij</div>
-<div id="menu_1.2.5.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.6', '../../skin/')" id="menu_1.2.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.2.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/start_toc.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/start_toc.html?rev=307190&r1=307189&r2=307190&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/start_toc.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/start_toc.html Fri Oct  7 13:44:21 2005
@@ -96,6 +96,9 @@
 <div class="menuitem">
 <a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
 </div>
+<div class="menuitem">
+<a href="../../integrate/db_torque.html">Torque</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Eclipse Plug-ins</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -109,18 +112,21 @@
 <a href="../../integrate/plugin_howto.html">10.1 Core and 1.1 UI</a>
 </div>
 <div class="menuitem">
+<a href="../../integrate/Readme.html">Building 1.1 UI</a>
+</div>
+<div class="menuitem">
 <a href="../../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.2.5', '../../skin/')" id="menu_selected_1.2.5Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_selected_1.2.5" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.2.6', '../../skin/')" id="menu_selected_1.2.6Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_selected_1.2.6" class="selectedmenuitemgroup" style="display: block;">
 <div class="menupage">
 <div class="menupagetitle">Getting Started</div>
 </div>
 <div class="menuitem">
 <a href="../../integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.3', '../../skin/')" id="menu_1.2.5.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.2.5.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.3', '../../skin/')" id="menu_1.2.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.2.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -131,8 +137,8 @@
 <a href="../../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.4', '../../skin/')" id="menu_1.2.5.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.2.5.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.4', '../../skin/')" id="menu_1.2.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.2.6.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -146,8 +152,8 @@
 <div class="menuitem">
 <a href="../../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.6', '../../skin/')" id="menu_1.2.5.6Title" class="menutitle">ij</div>
-<div id="menu_1.2.5.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.6', '../../skin/')" id="menu_1.2.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.2.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/stop_server.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/stop_server.html?rev=307190&r1=307189&r2=307190&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/stop_server.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/stop_server.html Fri Oct  7 13:44:21 2005
@@ -96,6 +96,9 @@
 <div class="menuitem">
 <a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
 </div>
+<div class="menuitem">
+<a href="../../integrate/db_torque.html">Torque</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Eclipse Plug-ins</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -109,18 +112,21 @@
 <a href="../../integrate/plugin_howto.html">10.1 Core and 1.1 UI</a>
 </div>
 <div class="menuitem">
+<a href="../../integrate/Readme.html">Building 1.1 UI</a>
+</div>
+<div class="menuitem">
 <a href="../../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.2.5', '../../skin/')" id="menu_selected_1.2.5Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_selected_1.2.5" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.2.6', '../../skin/')" id="menu_selected_1.2.6Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_selected_1.2.6" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/start_toc.html">Getting Started</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.3', '../../skin/')" id="menu_1.2.5.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.2.5.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.3', '../../skin/')" id="menu_1.2.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.2.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -131,8 +137,8 @@
 <a href="../../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.2.5.4', '../../skin/')" id="menu_selected_1.2.5.4Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Network Server</div>
-<div id="menu_selected_1.2.5.4" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.2.6.4', '../../skin/')" id="menu_selected_1.2.6.4Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Network Server</div>
+<div id="menu_selected_1.2.6.4" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -146,8 +152,8 @@
 <div class="menuitem">
 <a href="../../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.6', '../../skin/')" id="menu_1.2.5.6Title" class="menutitle">ij</div>
-<div id="menu_1.2.5.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.6', '../../skin/')" id="menu_1.2.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.2.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/sysinfo.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/sysinfo.html?rev=307190&r1=307189&r2=307190&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/sysinfo.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/sysinfo.html Fri Oct  7 13:44:21 2005
@@ -96,6 +96,9 @@
 <div class="menuitem">
 <a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
 </div>
+<div class="menuitem">
+<a href="../../integrate/db_torque.html">Torque</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">Eclipse Plug-ins</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -109,18 +112,21 @@
 <a href="../../integrate/plugin_howto.html">10.1 Core and 1.1 UI</a>
 </div>
 <div class="menuitem">
+<a href="../../integrate/Readme.html">Building 1.1 UI</a>
+</div>
+<div class="menuitem">
 <a href="../../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_selected_1.2.5', '../../skin/')" id="menu_selected_1.2.5Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_selected_1.2.5" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_selected_1.2.6', '../../skin/')" id="menu_selected_1.2.6Title" class="menutitle" style="background-image: url('../../skin/images/chapter_open.gif');">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_selected_1.2.6" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/start_toc.html">Getting Started</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.3', '../../skin/')" id="menu_1.2.5.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.2.5.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.3', '../../skin/')" id="menu_1.2.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.2.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -131,8 +137,8 @@
 <a href="../../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.4', '../../skin/')" id="menu_1.2.5.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.2.5.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.4', '../../skin/')" id="menu_1.2.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.2.6.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -146,8 +152,8 @@
 <div class="menuitem">
 <a href="../../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.6', '../../skin/')" id="menu_1.2.5.6Title" class="menutitle">ij</div>
-<div id="menu_1.2.5.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.6', '../../skin/')" id="menu_1.2.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.2.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/plugin_howto.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_howto.html?rev=307190&r1=307189&r2=307190&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_howto.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_howto.html Fri Oct  7 13:44:21 2005
@@ -95,6 +95,9 @@
 <div class="menuitem">
 <a href="../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
 </div>
+<div class="menuitem">
+<a href="../integrate/db_torque.html">Torque</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Eclipse Plug-ins</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -108,18 +111,21 @@
 <div class="menupagetitle">10.1 Core and 1.1 UI</div>
 </div>
 <div class="menuitem">
+<a href="../integrate/Readme.html">Building 1.1 UI</a>
+</div>
+<div class="menuitem">
 <a href="../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5', '../skin/')" id="menu_1.2.5Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_1.2.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6', '../skin/')" id="menu_1.2.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_1.2.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/start_toc.html">Getting Started</a>
 </div>
 <div class="menuitem">
 <a href="../integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.3', '../skin/')" id="menu_1.2.5.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.2.5.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.3', '../skin/')" id="menu_1.2.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.2.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -130,8 +136,8 @@
 <a href="../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.4', '../skin/')" id="menu_1.2.5.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.2.5.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.4', '../skin/')" id="menu_1.2.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.2.6.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -145,8 +151,8 @@
 <div class="menuitem">
 <a href="../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.6', '../skin/')" id="menu_1.2.5.6Title" class="menutitle">ij</div>
-<div id="menu_1.2.5.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.6', '../skin/')" id="menu_1.2.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.2.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>

Modified: db/derby/site/trunk/build/site/integrate/plugin_slides.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_slides.html?rev=307190&r1=307189&r2=307190&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_slides.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_slides.html Fri Oct  7 13:44:21 2005
@@ -95,6 +95,9 @@
 <div class="menuitem">
 <a href="../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
 </div>
+<div class="menuitem">
+<a href="../integrate/db_torque.html">Torque</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', '../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Eclipse Plug-ins</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -107,19 +110,22 @@
 <div class="menuitem">
 <a href="../integrate/plugin_howto.html">10.1 Core and 1.1 UI</a>
 </div>
+<div class="menuitem">
+<a href="../integrate/Readme.html">Building 1.1 UI</a>
+</div>
 <div class="menupage">
 <div class="menupagetitle">Derby Plug-ins Slides and Lab</div>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5', '../skin/')" id="menu_1.2.5Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_1.2.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6', '../skin/')" id="menu_1.2.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_1.2.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/start_toc.html">Getting Started</a>
 </div>
 <div class="menuitem">
 <a href="../integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.3', '../skin/')" id="menu_1.2.5.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.2.5.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.3', '../skin/')" id="menu_1.2.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.2.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -130,8 +136,8 @@
 <a href="../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.4', '../skin/')" id="menu_1.2.5.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.2.5.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.4', '../skin/')" id="menu_1.2.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.2.6.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -145,8 +151,8 @@
 <div class="menuitem">
 <a href="../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.5.6', '../skin/')" id="menu_1.2.5.6Title" class="menutitle">ij</div>
-<div id="menu_1.2.5.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.2.6.6', '../skin/')" id="menu_1.2.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.2.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>

Modified: db/derby/site/trunk/build/site/linkmap.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/linkmap.html?rev=307190&r1=307189&r2=307190&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/linkmap.html (original)
+++ db/derby/site/trunk/build/site/linkmap.html Fri Oct  7 13:44:21 2005
@@ -242,6 +242,9 @@
 <div class="menuitem">
 <a href="integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
 </div>
+<div class="menuitem">
+<a href="integrate/db_torque.html">Torque</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.10', 'skin/')" id="menu_1.10Title" class="menutitle">Eclipse Plug-ins</div>
 <div id="menu_1.10" class="menuitemgroup">
@@ -255,18 +258,21 @@
 <a href="integrate/plugin_howto.html">10.1 Core and 1.1 UI</a>
 </div>
 <div class="menuitem">
+<a href="integrate/Readme.html">Building 1.1 UI</a>
+</div>
+<div class="menuitem">
 <a href="integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_1.10.5', 'skin/')" id="menu_1.10.5Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
-<div id="menu_1.10.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.10.6', 'skin/')" id="menu_1.10.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_1.10.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="integrate/plugin_help/start_toc.html">Getting Started</a>
 </div>
 <div class="menuitem">
 <a href="integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
-<div onclick="SwitchMenu('menu_1.10.5.3', 'skin/')" id="menu_1.10.5.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.10.5.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.10.6.3', 'skin/')" id="menu_1.10.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.10.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -277,8 +283,8 @@
 <a href="integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.10.5.4', 'skin/')" id="menu_1.10.5.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.10.5.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.10.6.4', 'skin/')" id="menu_1.10.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.10.6.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -292,8 +298,8 @@
 <div class="menuitem">
 <a href="integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.10.5.6', 'skin/')" id="menu_1.10.5.6Title" class="menutitle">ij</div>
-<div id="menu_1.10.5.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.10.6.6', 'skin/')" id="menu_1.10.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.10.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>
@@ -925,6 +931,12 @@
 <a href="integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>jpetstoreW</em>
 </li>
 </ul>
+      
+<ul>
+<li>
+<a href="integrate/db_torque.html">Torque</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>torque</em>
+</li>
+</ul>
   
 </ul>
 </ul>
@@ -951,6 +963,12 @@
 <ul>
 <li>
 <a href="integrate/plugin_howto.html">10.1 Core and 1.1 UI</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>eclipse_new</em>
+</li>
+</ul>
+         
+<ul>
+<li>
+<a href="integrate/Readme.html">Building 1.1 UI</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>src_readme</em>
 </li>
 </ul>
          

Added: db/derby/site/trunk/src/documentation/content/xdocs/integrate/db_torque.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/integrate/db_torque.xml?rev=307190&view=auto
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/integrate/db_torque.xml (added)
+++ db/derby/site/trunk/src/documentation/content/xdocs/integrate/db_torque.xml Fri Oct  7 13:44:21 2005
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document> 
+  <header> 
+    <title>Running the Torque Tutorial on Derby</title> 
+  </header> 
+  <body> 
+
+<section>
+  <title>Overview</title>
+<p>
+<a href="http://db.apache.org/torque">Torque</a>, an Apache DB subproject,
+is a persistence layer that performs object mapping between java 
+objects and a relational database. 
+</p>
+<p>
+Torque 3.2-rc2 has an
+<a href="http://db.apache.org/torque/releases/torque-3.2-rc2/runtime/tutorial/index.html">excellent 
+tutorial</a> that uses MySQL.
+This page summarizes the changes 
+required for each step to run the tutorial on Derby 10.1
+using the Derby embedded JDBC driver. 
+</p>
+
+<p>
+Currently Torque just works with the embedded driver;
+it doesn't work with the
+Derby Network Client JDBC driver or the
+IBM DB2 Universal JDBC driver.
+Details are in
+<a href="http://issues.apache.org/jira/browse/DERBY-142">DERBY-142</a>.
+</p>
+
+</section>
+
+<section>
+  <title>Step 1</title>
+</section>
+
+<p>
+No changes to this step are required.
+</p>
+
+<section>
+  <title>Step 2</title>
+
+  <section>
+    <title>Torque Generator Properties</title>
+
+    <p>Below is a <code>project.properties</code> file that works
+      with the Derby embedded driver:</p>
+
+<source>
+   # The name of the project Torque will generate code for.
+   torque.project = bookstore
+
+   # The target database platform.
+   torque.database = derby
+
+   # The target package to put the generated classes in.
+   torque.targetPackage = com.kazmier.om
+
+   # The JDBC URL that Torque can use to create and
+   # drop databases if instructed to do so.
+   # Derby note: Manually create/drop databases
+   torque.database.createUrl =
+
+   # The JDBC URL that will be used to create tables in your database.
+   torque.database.buildUrl = jdbc:derby:bookstore
+
+   # The JDBC URL that will be used to access your database.
+   torque.database.url = jdbc:derby:bookstore
+
+   # The JDBC database driver to use when connecting to your database.
+   torque.database.driver = org.apache.derby.jdbc.EmbeddedDriver
+
+   # The administrative username that has sufficient privileges to create
+   # and drop databases and tables that Torque executes at generation time.
+   torque.database.user = app
+
+   # The administrative password for the supplied username.
+   torque.database.password = app
+
+   # The hostname or IP address of your database server.
+   torque.database.host = 127.0.0.1 
+  </source>
+
+  </section>
+
+  <section>
+    <title>Torque Database Schema</title>
+
+    <p>
+    There is one problem with the <code>src/schema/project-schema.xml</code>
+    file that the Torque Tutorial provides.
+    Torque generates DDL statements in the same order that the objects are
+    defined in this XML file.
+    The BOOK table is listed first in the file and references
+    the PUBLISHER and AUTHOR tables, which are defined later.
+    Derby doesn't support forward references, so creating the BOOK table fails.
+    To workaround this issue,
+    move the XML definition for the BOOK table to the end of the file,
+    after the definitions for the PUBLISHER and AUTHOR tables.
+    </p>
+  </section>
+</section>
+
+
+<section>
+  <title>Step 3</title>
+
+  <section>
+     <title>Adding the driver to the maven repository</title>
+
+<p>
+I added the Derby jar to my local maven repository like this:
+</p>
+
+<source>
+  mkdir ~/.maven/repository/derby
+  mkdir ~/.maven/repository/derby/jars
+  cp /opt/Apache/db-derby-10.1.1.0-bin/lib/derby.jar ~/.maven/repository/derby/jars/derby-10.1.1.0-bin.jar
+</source>
+
+<p>
+There are probably other ways for incorporating the Derby jar
+that don't require renaming the jar to include the version.
+</p>
+
+
+  </section>
+
+  <section>
+     <title>Specifying the driver dependency</title>
+<p>
+Here is the complete <code>project.xml</code> file:
+</p>
+
+<source>
+   &lt;project&gt;
+     &lt;pomVersion&gt;3&lt;/pomVersion&gt;
+     &lt;groupId&gt;torque&lt;/groupId&gt;
+     &lt;id&gt;torque-tutorial&lt;/id&gt;
+     &lt;name&gt;Torque&lt;/name&gt;
+     &lt;currentVersion&gt;3.2-rc2&lt;/currentVersion&gt;
+
+     &lt;dependencies&gt;
+
+       &lt;dependency&gt;
+         &lt;artifactId&gt;derby&lt;/artifactId&gt;
+         &lt;groupId&gt;derby&lt;/groupId&gt;
+         &lt;version&gt;10.1.1.0-bin&lt;/version&gt;
+       &lt;/dependency&gt;
+
+     &lt;/dependencies&gt;
+   &lt;/project&gt;
+</source>
+
+  </section>
+
+  <section>
+     <title>Creating the database</title>
+
+<p>
+The Torque Tutorial instructions mention that 
+<code>maven torque:create-db</code>
+doesn't work for
+all databases, and I didn't find a way to make it work for Derby.
+(I also didn't try very hard, so it might be possible.)
+</p>
+
+<p>
+Manually create the database in the root directory of
+your Torque project like this:
+</p>
+
+<source>
+   java org.apache.derby.tools.ij
+   ij version 10.1
+   ij&gt; connect 'jdbc:derby:bookstore;create=true';
+   ij&gt; quit; 
+</source>
+
+<p>
+Now set the
+<code>DERBY_SYSTEM_HOME</code> environment variable to this directory location.
+You'll use it in Step 6
+to set the <code>derby.system.home</code> property 
+so Derby will know where to find the database you created.
+For example, here is how I set it on my Linux machine:
+</p>
+
+<source>
+   export DERBY_SYSTEM_HOME=/home/jta/Apache/TorqueTutorial
+</source>
+
+<p>
+If I were on Windows, I would have set the variable like this instead:
+</p>
+
+<source>
+   set DERBY_SYSTEM_HOME=C:\home\jta\Apache\TorqueTutorial
+</source>
+
+  </section>
+
+  <section>
+     <title>Creating the tables</title>
+<p>
+No changes to this step are required.
+</p>
+  </section>
+</section>
+
+<section>
+  <title>Step 4</title>
+
+  <section>
+     <title>Setting up the classpath</title>
+<p>
+As of this writing on October 7,
+the village dependency version defined in Step 4 (2.0-dev-20030825)
+does not match Step 6; so set it as shown below:
+</p>
+
+<source>
+    &lt;dependency&gt;
+      &lt;artifactId&gt;village&lt;/artifactId&gt;
+      &lt;groupId&gt;village&lt;/groupId&gt;
+      &lt;version&gt;2.0&lt;/version&gt;
+    &lt;/dependency&gt;
+</source>
+
+  </section>
+
+  <section>
+     <title>Torque Run-Time Properties</title>
+<p>
+Here is the complete <code>src/conf/torque.properties</code> file:
+</p>
+
+<source>
+   torque.database.default = bookstore
+   torque.database.bookstore.adapter = derby
+
+   #Using commons-dbcp
+   torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+   torque.dsfactory.bookstore.connection.driver = org.apache.derby.jdbc.EmbeddedDriver
+   torque.dsfactory.bookstore.connection.url = jdbc:derby:bookstore
+   torque.dsfactory.bookstore.connection.user = app
+   torque.dsfactory.bookstore.connection.password = app
+</source>
+
+  </section>
+</section>
+
+<section>
+  <title>Step 5</title>
+<p>
+No changes to this step are required.
+</p>
+</section>
+
+<section>
+  <title>Step 6</title>
+
+<p>
+I made two modifications for running the sample application:
+</p>
+
+<ul>
+  <li> Set the <code>derby.system.home</code> property to the environment
+       variable created in Step 3.
+  </li>
+  <li> Replace the mysql jar with the derby jar:
+       <code>lib/derby-10.1.1.0-bin.jar</code>
+  </li>
+</ul>
+
+<p>
+Here is the command I ran on my Linux machine:
+</p>
+
+<source>
+   [jta@gertie target]$ java -Dderby.system.home=$DERBY_SYSTEM_HOME -cp classes:lib/avalon-framework-4.1.4.jar:lib/commons-beanutils-1.7.0.jar:lib/commons-collections-3.1.jar:lib/commons-configuration-1.1.jar:lib/commons-dbcp-1.2.1.jar:lib/commons-lang-2.1.jar:lib/commons-logging-1.0.4.jar:lib/commons-pool-1.2.jar:lib/jcs-20030822.182132.jar:lib/derby-10.1.1.0-bin.jar:lib/torque-3.2-rc2.jar:lib/village-2.0.jar com.kazmier.Bookstore
+</source>
+
+</section>
+
+<section>
+  <title>Got Questions?</title>
+
+  <p>
+  Jean Anderson wrote these instructions.
+  Please post any questions about them 
+  to <a href="../derby_mail.html">derby-user@db.apache.org</a>.
+  </p>
+
+</section>
+
+<p><em>Last Updated: October 7, 2005</em></p>
+
+</body>
+</document>

Propchange: db/derby/site/trunk/src/documentation/content/xdocs/integrate/db_torque.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/site/trunk/src/documentation/content/xdocs/integrate/index.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/integrate/index.xml?rev=307190&r1=307189&r2=307190&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/integrate/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/integrate/index.xml Fri Oct  7 13:44:21 2005
@@ -61,6 +61,12 @@
    <td><em><a href="JPetStoreWebSphere.html">Using Apache Derby with 
          iBATIS JPetStore 4 on the WebSphere Server</a></em></td>
 </tr>
+
+<tr>
+   <td>Torque</td>
+   <td><em><a href="db_torque.html">Running the Torque Tutorial on Derby</a></em></td>
+</tr>
+
 </table>
 <p>
 
@@ -106,7 +112,7 @@
 </tr>
 </table>
 
-<p><em>Last Updated: August 31, 2005</em></p>
+<p><em>Last Updated: October 6, 2005</em></p>
 
 </body>
 </document>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/site.xml?rev=307190&r1=307189&r2=307190&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/site.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/site.xml Fri Oct  7 13:44:21 2005
@@ -78,12 +78,14 @@
       <jonas     label="JOnAS (PDF)"  href="../binaries/DerbyAndRedHatAppServer.pdf" />
       <jpetstoreG label="JPetStore Geronimo" href="JPetStoreGeronimo.html" />
       <jpetstoreW label="JPetStore WebSphere" href="JPetStoreWebSphere.html" />
+      <torque     label="Torque" href="db_torque.html" />
   </integrate>
 
       <eclipse label="Eclipse Plug-ins" href="integrate/" tab="integrate">
          <eclipse_old   label="10.1 Core"   href="derby_plugin.html"/>
          <eclipse_spec  label="1.0 UI Functional Spec"     href="func_spec_plugins.html"/>
          <eclipse_new   label="10.1 Core and 1.1 UI"   href="plugin_howto.html"/>
+         <src_readme label="Building 1.1 UI" href="Readme.html" />
          <eclipse_present label="Derby Plug-ins Slides and Lab"   href="plugin_slides.html"/>
          <eclipse_help   label="10.1 Core and 1.1 UI Documentation"   href="plugin_help/">
            <start label="Getting Started" href="start_toc.html" />



Mime
View raw message