db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r329332 [1/2] - in /db/derby/site/trunk: build/site/ build/site/binaries/ build/site/images/ build/site/integrate/ build/site/integrate/plugin_help/ src/documentation/content/xdocs/ src/documentation/content/xdocs/binaries/ src/documentatio...
Date Sat, 29 Oct 2005 00:12:10 GMT
Author: jta
Date: Fri Oct 28 17:07:52 2005
New Revision: 329332

URL: http://svn.apache.org/viewcvs?rev=329332&view=rev
Log:
DERBY-659 : Added Stan Bradbury's Tomcat article to the Integration section.
I also updated the site.xml to include the new article in the Integration 
tab navigation.  Because of the site navigation change, all pages on the 
Integration tab were modified.

Added:
    db/derby/site/trunk/build/site/binaries/DerbyJPetStore4Tomcat.zip   (with props)
    db/derby/site/trunk/build/site/images/TomcatDeploy.gif   (with props)
    db/derby/site/trunk/build/site/integrate/DerbyTomcat5512JPetStor.html   (with props)
    db/derby/site/trunk/src/documentation/content/xdocs/binaries/DerbyJPetStore4Tomcat.zip   (with props)
    db/derby/site/trunk/src/documentation/content/xdocs/images/TomcatDeploy.gif   (with props)
    db/derby/site/trunk/src/documentation/content/xdocs/integrate/DerbyTomcat5512JPetStor.xml   (with props)
Modified:
    db/derby/site/trunk/build/site/integrate/JPetStoreGeronimo.html
    db/derby/site/trunk/build/site/integrate/JPetStoreWebSphere.html
    db/derby/site/trunk/build/site/integrate/Readme.html
    db/derby/site/trunk/build/site/integrate/db_torque.html
    db/derby/site/trunk/build/site/integrate/derby_plugin.html
    db/derby/site/trunk/build/site/integrate/func_spec_plugins.html
    db/derby/site/trunk/build/site/integrate/index.html
    db/derby/site/trunk/build/site/integrate/misc.html
    db/derby/site/trunk/build/site/integrate/plugin_help/derby_app.html
    db/derby/site/trunk/build/site/integrate/plugin_help/ij.html
    db/derby/site/trunk/build/site/integrate/plugin_help/ij2.html
    db/derby/site/trunk/build/site/integrate/plugin_help/ij_toc.html
    db/derby/site/trunk/build/site/integrate/plugin_help/java_project.html
    db/derby/site/trunk/build/site/integrate/plugin_help/nature.html
    db/derby/site/trunk/build/site/integrate/plugin_help/nature_toc.html
    db/derby/site/trunk/build/site/integrate/plugin_help/properties.html
    db/derby/site/trunk/build/site/integrate/plugin_help/remove_nature.html
    db/derby/site/trunk/build/site/integrate/plugin_help/resources.html
    db/derby/site/trunk/build/site/integrate/plugin_help/server_toc.html
    db/derby/site/trunk/build/site/integrate/plugin_help/start_server.html
    db/derby/site/trunk/build/site/integrate/plugin_help/start_toc.html
    db/derby/site/trunk/build/site/integrate/plugin_help/stop_server.html
    db/derby/site/trunk/build/site/integrate/plugin_help/sysinfo.html
    db/derby/site/trunk/build/site/integrate/plugin_howto.html
    db/derby/site/trunk/build/site/integrate/plugin_slides.html
    db/derby/site/trunk/build/site/linkmap.html
    db/derby/site/trunk/src/documentation/content/xdocs/integrate/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/site.xml

Added: db/derby/site/trunk/build/site/binaries/DerbyJPetStore4Tomcat.zip
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/binaries/DerbyJPetStore4Tomcat.zip?rev=329332&view=auto
==============================================================================
Binary file - no diff available.

Propchange: db/derby/site/trunk/build/site/binaries/DerbyJPetStore4Tomcat.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: db/derby/site/trunk/build/site/images/TomcatDeploy.gif
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/images/TomcatDeploy.gif?rev=329332&view=auto
==============================================================================
Binary file - no diff available.

Propchange: db/derby/site/trunk/build/site/images/TomcatDeploy.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: db/derby/site/trunk/build/site/integrate/DerbyTomcat5512JPetStor.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/DerbyTomcat5512JPetStor.html?rev=329332&view=auto
==============================================================================
--- db/derby/site/trunk/build/site/integrate/DerbyTomcat5512JPetStor.html (added)
+++ db/derby/site/trunk/build/site/integrate/DerbyTomcat5512JPetStor.html Fri Oct 28 17:07:52 2005
@@ -0,0 +1,652 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="Apache Forrest" name="Generator">
+<meta name="Forrest-version" content="0.7">
+<meta name="Forrest-skin-name" content="pelt">
+<title>Embedding  Apache Derby in Tomcat and creating an iBATIS JPetStore Demo</title>
+<link type="text/css" href="../skin/basic.css" rel="stylesheet">
+<link media="screen" type="text/css" href="../skin/screen.css" rel="stylesheet">
+<link media="print" type="text/css" href="../skin/print.css" rel="stylesheet">
+<link type="text/css" href="../skin/profile.css" rel="stylesheet">
+<script src="../skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="../skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="../skin/fontsize.js" language="javascript" type="text/javascript"></script>
+<link rel="shortcut icon" href="../">
+</head>
+<body onload="init()">
+<script type="text/javascript">ndeSetTextSize();</script>
+<div id="top">
+<div class="breadtrail">
+<a href="http://www.apache.org/">apache</a> &gt; <a href="http://db.apache.org/">db</a><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
+</div>
+<div class="header">
+<div class="grouplogo">
+<a href="http://db.apache.org"><img class="logoImage" alt="" src="../images/db-logo-white.png" title=""></a>
+</div>
+<div class="projectlogo">
+<a href="http://db.apache.org/derby/"><img class="logoImage" alt="Derby" src="../images/derby-logo.jpg" title="Derby is a zero admin Java RDBMS."></a>
+</div>
+<div class="searchbox">
+<form action="http://www.google.com/search" method="get" class="roundtopsmall">
+<input value="apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
+                    <input attr="value" name="Search" value="Search" type="submit">
+</form>
+</div>
+<ul id="tabs">
+<li>
+<a class="base-not-selected" href="../index.html">Home</a>
+</li>
+<li>
+<a class="base-not-selected" href="../derby_comm.html">Community</a>
+</li>
+<li>
+<a class="base-not-selected" href="../manuals/index.html">Manuals</a>
+</li>
+<li>
+<a class="base-not-selected" href="../papers/index.html">Papers</a>
+</li>
+<li class="current">
+<a class="base-selected" href="../integrate/index.html">Integration</a>
+</li>
+</ul>
+</div>
+</div>
+<div id="main">
+<div id="publishedStrip">
+<div id="level2tabs"></div>
+<script type="text/javascript"><!--
+document.write("<text>Last Published:</text> " + document.lastModified);
+//  --></script>
+</div>
+<div class="breadtrail">
+             
+             &nbsp;
+           </div>
+<div id="menu">
+<div onclick="SwitchMenu('menu_selected_1.1', '../skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Integration</div>
+<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
+<div class="menuitem">
+<a href="../integrate/index.html">Index</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/misc.html">Summary</a>
+</div>
+<div class="menuitem">
+<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
+</div>
+<div class="menuitem">
+<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/DOTS_Derby.htm">DOTS Derby</a>
+</div>
+<div class="menuitem">
+<a href="../binaries/UsingDotsDerbySystemTest.pdf">DOTS System</a>
+</div>
+<div class="menuitem">
+<a href="../binaries/DerbyCodeCoverageUsingEmma.pdf">EMMA</a>
+</div>
+<div class="menuitem">
+<a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
+</div>
+<div class="menupage">
+<div class="menupagetitle">Tomcat Demo</div>
+</div>
+<div class="menuitem">
+<a href="../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Eclipse Plug-ins</div>
+<div id="menu_1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="../integrate/derby_plugin.html">10.1 Core</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/func_spec_plugins.html">1.0 UI Functional Spec</a>
+</div>
+<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="menuitem">
+<a href="../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
+</div>
+<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.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>
+<div class="menuitem">
+<a href="../integrate/plugin_help/nature.html">Adding the Derby Nature</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
+</div>
+</div>
+<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>
+<div class="menuitem">
+<a href="../integrate/plugin_help/start_server.html">Starting the Server</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/stop_server.html">Stopping the Server</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/properties.html">Derby Properties</a>
+</div>
+<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>
+<div class="menuitem">
+<a href="../integrate/plugin_help/ij.html">SQL commands</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/ij2.html">SQL scripts</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/derby_app.html">Building a Java App</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/sysinfo.html">Running sysinfo</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/plugin_help/resources.html">Derby Manuals</a>
+</div>
+</div>
+</div>
+<div id="credit"></div>
+<div id="roundbottom">
+<img style="display: none" class="corner" height="15" width="15" alt="" src="../skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
+<div id="credit2"></div>
+</div>
+<div id="content">
+<div class="trail">
+<text>Font size:</text> 
+	          &nbsp;<input value="Reset" class="resetfont" title="Reset text" onclick="ndeSetTextSize('reset'); return false;" type="button">      
+	          &nbsp;<input value="-a" class="smallerfont" title="Shrink text" onclick="ndeSetTextSize('decr'); return false;" type="button">
+	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
+</div>
+<h1>Embedding  Apache Derby in Tomcat and creating an iBATIS JPetStore Demo</h1>
+<div id="minitoc-area">
+<ul class="minitoc">
+<li>
+<a href="#Why+Derby">Why Derby</a>
+</li>
+<li>
+<a href="#The+Software+Components">The Software Components</a>
+</li>
+<li>
+<a href="#Typographic+Conventions+Used">Typographic Conventions Used</a>
+</li>
+<li>
+<a href="#Required+Software+%2F+Downloads">Required Software / Downloads</a>
+</li>
+<li>
+<a href="#Setup+of+Application+with+the+Datasource+in+the+Global+Context%3A">Setup of Application with the Datasource in the Global Context:</a>
+</li>
+<li>
+<a href="#Alternate+Setup%3A+Datasource+in+the+Application+Context">Alternate Setup: Datasource in the Application Context</a>
+</li>
+<li>
+<a href="#Database+Creation+Instructions+%28optional%29">Database Creation Instructions (optional)</a>
+</li>
+<li>
+<a href="#General+Integration+Notes">General Integration Notes</a>
+</li>
+<li>
+<a href="#Tomcat+Integration+Notes">Tomcat Integration Notes</a>
+</li>
+<li>
+<a href="#iBATIS+Integration+Notes">iBATIS Integration Notes</a>
+</li>
+<li>
+<a href="#Rlinks">Links Section</a>
+</li>
+</ul>
+</div>
+		
+<p>This is the third in a series of articles that detail creating a demonstration web application using a Derby database running in different server environments.   This article details how to create the demo on the Apache Tomcat Server.  See the links in the <a href="#Rlinks">Related Articles</a> section below to access the other articles.</p>
+
+		
+<div class="frame note">
+<div class="label">Note</div>
+<div class="content">	As of this writing (Oct 2005), Tomcat 5.5.12 has just been declared a "stable release" and is used for this demonstration.  Version 5.5.12 bundles the DBCP libraries needed to establish the datasource connection pool used by the system.  If you will be using an older version of Tomcat you will need to add this component as described on the <em>JDBC Datasources</em> page for your release.  You may also need to address other version differences.  This deployment was not tested on other Tomcat versions.</div>
+</div>
+		
+		
+<p>
+   This article shows the steps required to embed Derby in a Tomcat version 5.5.12 Server and  then deploy a copy of the iBATIS JPetStore application that utilizes a Derby database.  The implementation accesses the Derby database via a JNDI registered datasource and hence the same application code and Derby database can be used unchanged to create the demo in different environments.  Details are provided for registering the datasource as either a Tomcat server-wide (Global) JNDI resource or a per-application (context specific) JNDI resource.</p>
+		
+<a name="N1001C"></a><a name="Why+Derby"></a>
+<h2 class="boxed">Why Derby</h2>
+<div class="section">
+<p>
+Most J2EE applications use a JDBC-compliant database to store data.  Arguably, one of the more time consuming tasks when deploying such an web application is the database setup.  These steps often involve compiling DBMS code (if the database system is not already installed) then creating and populating the physical database itself.  Since Derby is implemented entirely in JAVA these steps can be avoided.  Simply put, Derby is easy add to a Tomcat Server environment and reduces the complexity of deploying applications that use a database.</p>
+<p>
+Installation of the Derby DBMS is as simple as copying a 2 Mb jarfile to a known location.  Like any other general use component the Derby jarfile is added to the Tomcat common shared library directory.  Setup of the physical database and application data can be as easy as copying the fully initialized physical database to a location on the Server machine then configuring datasource to access it.  The following instructions demonstrate the ease with which this can be accomplished using Tomcat version 5.5.12.
+</p>
+</div>
+		
+		
+<a name="N1002B"></a><a name="The+Software+Components"></a>
+<h2 class="boxed">The Software Components</h2>
+<div class="section">
+<p>Derby is an open source, java relational database freely available from the Apache Software Foundation (ASF).  It is well suited for use with Java applications that require data persistence and is ideally suited for use in a Server environment like Tomcat.  Derby can be used in one of two configurations, embedded in a java application or used with Network Server and run as a separate DBMS process.  When embedded in an application like Tomcat that provides network communication services there is usually no need to run the Network Server.</p>
+<p>
+Tomcat is a widely used, open source web application server freely available from ASF.  Initially designed as a servlet/JSP container Tomcat now bundles many additional components that provide J2EE Server capabilities to the system.  Tomcat development is managed as a subproject of the Apache Jakarta project.</p>
+<p>
+JPetStore is a rewritten Pet Store application based on Sun's J2EE Pet Store. It was originally designed to compare the .NET and J2EE architectures. It is now the official example application for the iBATIS Data Mapper framework.  iBATIS  greatly simplifies the coding of Java and .NET applications that access data from a relational database like Derby.  iBATIS, like the other software used in this implementation is an open source product freely available from ASF.</p>
+</div>
+		
+<a name="N1003B"></a><a name="Typographic+Conventions+Used"></a>
+<h2 class="boxed">Typographic Conventions Used</h2>
+<div class="section">
+<p> The following codes in curly braces will be used to represent installation dependant information as described below:</p>
+<dl>
+				
+<dt>{Tomcat_Home}</dt>
+				
+<dd> The installation directory for the Tomcat server (a.k.a. <span class="codefrag">CATALINA_HOME</span>).</dd>
+				
+<dt>{machine-name}</dt>
+				
+<dd> the hostname of the machine on which the server and application are installed.</dd>
+				
+<dt>{Derby_System_Home}</dt>
+				
+<dd> the directory containing the <span class="codefrag">derby.log</span> file.  This is the default output directory for Derby and should be the same as {Tomcat_Home}.  The JPetStoreDB database will be located in the  <span class="codefrag">{Derby_System_Home}\Databases</span> subdirectory. </dd>
+				
+<dt>{Derby_Jars}</dt>
+				
+<dd> The location of the derby jarfiles.  In this installation the location will be the Tomcat common shared library directory: <span class="codefrag">{Tomcat_Home}/common/lib</span>
+				
+</dd>
+			
+</dl>
+</div>
+		
+<a name="N1006C"></a><a name="Required+Software+%2F+Downloads"></a>
+<h2 class="boxed">Required Software / Downloads</h2>
+<div class="section">
+<ul>
+			
+<li>If necessary, install a functional J2SE Java Developers Kit (JDK).  Tomcat 5.5.12 requires JDK 5.0 by default.  If you will be using an JDK please see the Tomcat documentation for setup information.  The JDK 'bin' directory should be included in your PATH.</li>
+				
+<li> If necessary, Download and install  <a class="external" href="http://tomcat.apache.org/download-55.cgi#5.5.12">Tomcat v 5.5.12</a>. </li>
+				
+<li>Download the <a href="../binaries/DerbyJPetStore4Tomcat.zip">DerbyJPetStore4Tomcat.zip</a>  file (4.8 Mb) associated with this article.  Move the file to the directory {Tomcat_Home}/work.</li>
+			
+</ul>
+</div>
+		
+<a name="N10087"></a><a name="Setup+of+Application+with+the+Datasource+in+the+Global+Context%3A"></a>
+<h2 class="boxed">Setup of Application with the Datasource in the Global Context:</h2>
+<div class="section">
+<p>The initial steps below walk you through moving the files contained in the DerbyJPetStore4Tomcat.zip file to the  locations required to support the deployment instructions that follow.  Note that the zipfile contains not only the application system but also the DBMS and the initialized database.  No database activity is required other than placing the files in the proper directories.  Assuming you have a functioning Tomcat 5.5.12 system already everything you need to create the demo is found in the zipfile associated with this article.</p>
+<p>Subsequent steps show you how to define the JPetStoreDB datasource connection pool in the Global Naming Context.  When defined in this way the datasource can be utilized by any application running on the server.  Once the datasource required by the application is defined the JPetStore application is deployed and you have a functioning web application.  The step-by-step instructions are:</p>
+<ul>
+				
+<li>
+					
+<strong>Stop Tomcat: </strong>Shutdown Tomcat if it is running.</li>
+				
+<li>
+					
+<strong>Extract the database zipfile and deployment files: </strong> Unzip the files from DerbyJPetStore4Tomcat.zip into the directory {Tomcat_Home}/work then "install" Derby as follows:
+					<ul>
+						
+<li>
+							
+<strong>Install the Derby DBMS system:</strong> Move the derby.jar file to the Tomcat 'common' directory  {Tomcat_Home}/common/lib.</li>
+						
+<li>
+							
+<strong>Setup the JPetstore database: </strong>Unzip the database from the DerbyJPetStoreDB.zip file and move the Databases directory tree to {Tomcat_Home}.  </li>
+					
+</ul>
+				
+</li>
+				
+<li>
+					
+<strong>Define the Global Datasource: </strong>A Global datasource is defined in the server XML configuration file <span class="codefrag">{Tomcat_Home}/conf/server.xml</span>.  Save a copy of the current server configuration file then add the following definition to <span class="codefrag">{Tomcat_Home}/conf/server.xml</span>.  The location of the definition must be in the Global Naming Resources section of the file.  For simplicity locate the end of section marker <span class="codefrag">&lt;/GlobalNamingResources&gt;</span> and add the  following lines just above it: <pre class="code">
+         &lt;!-- Global Datasource for Derby JPetStoreDB database --&gt;
+         &lt;Resource name="jdbc/JPetStoreDB"
+              type="javax.sql.DataSource"  auth="Container"
+              description="Derby database for JPetStoreApp"
+              maxActive="100" maxIdle="30" maxWait="10000"
+              username="" password="" 
+              driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+              url="jdbc:derby:Databases/JPetStoreDB"/&gt;
+			</pre>
+				
+</li>
+				
+<li>
+					
+<strong>Start Tomcat and the manager console:</strong> Start Tomcat and open the Manager application in a browser (URL for default installation:  http://{machine-name}:8080/manager/html).  Supply a valid username and password to access the <span class="codefrag">Tomcat Web Application Manager </span> screen.</li>
+				
+<li>
+					
+<strong>Deploy the JPetStore application: </strong> Scroll past the application list to the section labeled: <span class="codefrag">
+Deploy directory or WAR file located on server </span> (see Figure 1).  Enter the following information:<pre class="code">
+         Context Path (optional):   /JPetStoreApp
+      XML Configuration file URL:   work/JPetStoreAppGbl.xml
+            WAR or Directory URL:   work/JPetStoreApp.war
+      </pre>
+
+<div class="frame note">
+<div class="label">Figure 1: Tomcat Manager Deployment Screen</div>
+<div class="content">
+
+<img alt="TomcatDeploy" src="../images/TomcatDeploy.gif"> 
+</div>
+</div>
+      Click the <span class="codefrag">Deploy</span> button to deploy and start the application.  Check in the message section for the confirmation of a successful deployment: <span class="codefrag">OK - Deployed application at context path /JPetStoreApp</span>.
+  
+	   </li>
+				
+<li>
+					
+<strong>Test the application:</strong> In the <span class="codefrag">Applications</span> list section, click on the application name in the <span class="codefrag">Path</span> column or open the application from a new window with the URL: <span class="codefrag">http://{machine-name}:8080/JPetStoreApp</span>
+				
+</li>
+			
+</ul>
+</div>
+
+		
+<a name="N100F8"></a><a name="Alternate+Setup%3A+Datasource+in+the+Application+Context"></a>
+<h2 class="boxed">Alternate Setup: Datasource in the Application Context</h2>
+<div class="section">
+<p>The datasource connection pool used by the JPetStore application can be defined in the Global context as show above or in the Application context outlined here.  Either context will support connections between  iBATIS and Derby.  The difference between the two setups is whether or not another application deployed to this Tomcat server will be able to access the datasource.  When the datasource is defined in the Global context other applications can also connect to the pool by linking to the Global datasource using a copy of the <span class="codefrag">Resource-link</span> definition found in the <span class="codefrag">JPetStoreAppGbl.xml</span> file used in the deployment above.  This is the configuration that should be used if, say, a Petstore accounting or reporting application will be deployed in a separate secured context that is available to a limited number of users.
+			 </p>
+<p>When setting up a connection pool in the application context all the information about the datasource is provided in the application XML configuration file.  Compare this to the Global datasource setup where the definition is in the server XML configuration file <span class="codefrag">server.xml</span> rather than the application XML configuration file.  The contents of these two files are all that differs in the following set of steps for recreating the demo using an application context datasource.  </p>
+<div class="frame note">
+<div class="label">Note</div>
+<div class="content">The steps below assume you have performed the previous steps and already have the JPetStore files extracted and the derby.jar and Derby database copied to the proper locations.</div>
+</div>
+<ul>
+				
+<li>
+					
+<strong>Stop Tomcat: </strong>Shutdown Tomcat if it is running.</li>
+				
+<li>
+					
+<strong>Replace the server.xml file: </strong>Restore the copy of the original server.xml saved previously or delete the Datasource definitions lines added to the <span class="codefrag">GlobalNamingResources</span> section.  No changes to the server.xml file are needed in this configuration.</li>
+				
+<li>Extract the database zipfile and deployment files: <em>Already done</em>
+					
+<ul>
+						
+<li>Install the Derby DBMS system: <em>Already done</em>
+						
+</li>
+						
+<li>Setup the JPetstore database: <em>Already done</em>
+						
+</li>
+					
+</ul>
+				
+</li>
+				
+<li>
+					
+<strong>Start Tomcat and the manager console:</strong> Start Tomcat and open the Manager application in a browser (URL for default installation: <span class="codefrag">http://{machine-name}:8080/manager/html</span>).  Supply a valid username and password to access the <span class="codefrag">Tomcat Web Application Manager</span> screen.</li>
+				
+<li>
+					
+<strong>Undeploy the JPetStore application: </strong>The application deployed above is not functional and recorded errors to the logfile when it attempted to start.  Click the <span class="codefrag">Undeploy</span> for JPetStoreApp in the application list</li>
+				
+<li>
+					
+<strong>Deploy the JPetStoreA application: </strong> Scroll past the application list to the section labeled: <span class="codefrag">
+Deploy directory or WAR file located on server</span> (refer to Figure 1).  Enter the following information:<pre class="code">
+         Context Path (optional):   /JPetStoreAppA
+      XML Configuration file URL:   work/JPetStoreAppCntxt.xml
+            WAR or Directory URL:   work/JPetStoreApp.war
+      </pre>
+      Click the <span class="codefrag">Deploy</span> button to deploy and start the application.  Check in the message section for the confirmation of a successful deployment: <span class="codefrag">OK - Deployed application at context path /JPetStoreAppA</span>.
+	   </li>
+				
+<li>
+					
+<strong>Test the application:</strong> In the <span class="codefrag">Applications</span> list section, click on the application name in the <span class="codefrag">Path</span> column or open the application from a new window with the URL: <span class="codefrag">http://{machine-name}:8080/JPetStoreAppA</span>
+				
+</li>
+			
+</ul>
+</div>
+		
+<a name="N1016F"></a><a name="Database+Creation+Instructions+%28optional%29"></a>
+<h2 class="boxed">Database Creation Instructions (optional)</h2>
+<div class="section">
+<p>The following steps show how to build the Derby database from scratch.  This is similar to the build procedure required when deploying applications using most other DBMS system except a separate database creation step is not required.  Two files (*.sql) are supplied in the zipfile to perform the schema build and data inserts.  To use this procedure you will need to download a complete set of Derby jarfiles in order to obtain the IJ scripting tool used in the following commands.  The IJ tool is used to process the SQL commands in the provided scripts.  The IJ tool is contained in the derbytools.jar file.  Place derbytools.jar in the {Derby_Jars} directory.   For simplicity the examples below place all necessary files in the same directory and specify as much a possible (including the command to create the database) on the command line.</p>
+<ul>
+				
+<li>Copy the following SQL script files to the <span class="codefrag">{Derby_System_Home}\Databases</span> subdirectory where you will build the database: <span class="codefrag">,jpetstore-derby-schema.sql, jpetstore-derby-dataload.sql</span>.  Issue the following command to create the database, tables and indexes:
+	<pre class="code">
+   java -cp {Derby_Jars}/derby.jar:{Derby_Jars}/derbytools.jar \
+   -Dderby.system.home={Derby_System_Home}\Databases  \
+   -Dij.database=jdbc:derby:JPetStoreDB;create=true \
+   	   org.apache.derby.tools.ij jpetstore-derby-schema.sql
+	</pre>
+				
+</li>
+				
+<li>Now load the data into the tables using the following command:
+				<div class="frame note">
+<div class="label">Note</div>
+<div class="content">If you are performing the build on a Windows based OS change the classpath separator between the jarfile names for a colon (:) to a semicolon (;) in the following commands: 
+				 e.g.  java -cp {Derby_Jars}/derby.jar;{Derby_Jars}/derbytools.jar...</div>
+</div>
+					
+<pre class="code">
+	java -cp {Derby_Jars}/derby.jar:{Derby_Jars}/derbytools.jar   \
+	 -Dderby.system.home={Derby_System_Home}\Databases  \
+	 -Dij.database=jdbc:derby:JPetStoreDB  \
+	   org.apache.derby.tools.ij jpetstore-derby-dataload.sql
+	</pre>
+				
+</li>
+			
+</ul>
+<p>You now have a fully populated database to use with the JPetStore application.</p>
+</div>
+		
+		
+<a name="N10198"></a><a name="General+Integration+Notes"></a>
+<h2 class="boxed">General Integration Notes</h2>
+<div class="section">
+<p>
+J2EE Servers use multiple classloaders (aka hierarchies) to provide the isolation necessary to run many applications at once.  This Derby-JPetStore integration uses a Server defined datasource to avoid problems that can occur when Derby is used in an environment that has multiple classloaders.  Derby is written in Java and all its classes must be loaded by the same classloader.    When using a J2EE Server this can be assured by defining Derby datasources at the server level. This is particularly important when using Derby in it's embedded configuration.   When using a database or other datasource in a J2EE environment it is also a good design practice to access them via a J2EE resource managed by the server.    
+   	</p>
+<p>
+   	The zipfile provided contains a fully initialized database to demonstrate that a Derby database built and populated on one platform (in this case Windows) can be transferred to different platforms and work fine.  Try copying the database and derby jarfiles to different platforms and you will see that the system works without modification.  The text files included in the zipfile will not do well in an EBCDIC architecture but the Derby engine and supplied database will work fine. If you want to build the database from scratch you can use the SQL files supplied in the archive.  See the 'Optional Database Setup Instructions' section for how to use the IJ tools to build and populate the database.</p>
+</div>
+		
+		
+<a name="N101A5"></a><a name="Tomcat+Integration+Notes"></a>
+<h2 class="boxed">Tomcat Integration Notes</h2>
+<div class="section">
+<p>Tomcat is designed so that new java components (a.k.a. shared libraries) can be easily added to the system.  This is accomplished by adding the jarfiles containing the components to the $CATALINA_HOME/common/lib directory.  
+ Derby is designed to be used in just this manner.  The Derby manuals refer to this as embedding.  Embedding makes Derby just another component available to the applications deployed on Tomcat.  Adding the derby.jar file to the common shared libraries directory makes the Derby engine, not just the JDBC driver, available.  No separate steps are required to install, configure or start the Derby engine.</p>
+<p>The default Session Manager (<span class="codefrag">org.apache.catalina.session.StandardManager</span>) created for each application context (a.k.a. web application) enables <a class="external" href="http://tomcat.apache.org/tomcat-5.5-doc/config/manager.html#Restart Persistence">Restart persistence</a>.  This feature is disabled in the JPetStore XML configuration files to avoid the problem where the JNDI context <span class="codefrag">java:comp</span> is not accessible when the iBATIS Dao Transaction  Pool is restarted.  This problem is typified by startup messages in the <span class="codefrag">catalina.log</span> file containing the following error text: </p>
+<pre class="code">org.apache.catalina.session.StandardManager start
+SEVERE: Exception loading sessions from persistent storage
+java.lang.ExceptionInInitializerError
+  at com.ibatis.jpetstore.service.CatalogService.&lt;nit&gt;(CatalogService.java:23)
+       <em>--- rest of trace removed --</em>
+  Caused by: java.lang.RuntimeException: 
+      Could not initialize DaoConfig.  
+  Cause: com.ibatis.dao.client.DaoException: 
+      Error while configuring DaoManager. 
+  Cause: com.ibatis.sqlmap.client.SqlMapException: 
+      There was an error while building the SqlMap instance. 
+        <em> --  messages removed --</em>
+  --- Cause: com.ibatis.sqlmap.client.SqlMapException: 
+      There was an error configuring JndiDataSourceDaoTransactionPool. 
+  Cause: javax.naming.NameNotFoundException: 
+      Name java:comp is not bound in this Context </pre>
+<div class="frame note">
+<div class="label">Disabling Restart Persistence</div>
+<div class="content">The following line in the application XML configuration file sets the persistence file to an empty string and disables Restart Persistence for the application:  <span class="codefrag">   &lt;Manager pathname=""/&gt;   </span>
+</div>
+</div>
+</div>
+		
+<a name="N101CF"></a><a name="iBATIS+Integration+Notes"></a>
+<h2 class="boxed">iBATIS Integration Notes</h2>
+<div class="section">
+<p>If you wish to build your own iBATIS JPetstore war file like the one supplied in the zipfile file  you will need to download the JPetStore application source code (see the 'Related Links' section) and make the following modifications to the source files before performing a build as described in the JPetStore build instructions: </p>
+<ul>
+				
+<li>
+					Edit the <span class="codefrag">sql-map-config.xml</span> file and replace the existing TransactionManager definition section with the this section that specifies a JNDI lookup should be performed to obtain the datasource to use:
+			<pre class="code">
+   &lt;transactionManager type="JDBC" &gt;
+      &lt;dataSource type="JNDI"&gt;
+         &lt;property name="DBJndiContext" value="jdbc/JPetStoreDB"/&gt;
+      &lt;/dataSource&gt;
+   &lt;/transactionManager&gt;
+   </pre>
+				
+</li>
+				
+<li>Edit the <span class="codefrag">web.xml</span> file and replace the existing resource-ref definition with the following:
+      <pre class="code">
+      &lt;resource-ref&gt; 
+   &lt;description&gt;JPetStore DataSource&lt;/description&gt;
+	&lt;res-ref-name&gt;jdbc/JPetStoreDB&lt;/res-ref-name&gt;
+	&lt;res-type&gt;javax.sql.DataSource&lt;/res-type&gt;
+	&lt;res-auth&gt;Container&lt;/res-auth&gt;
+	&lt;res-sharing-scope&gt;Shareable&lt;/res-sharing-scope&gt;
+   &lt;/resource-ref&gt;
+   </pre>
+				
+</li>
+			
+</ul>
+</div>
+		
+		
+<a name="N101F2"></a><a name="Rlinks"></a>
+<h2 class="boxed">Links Section</h2>
+<div class="section">
+<p>Required Downloads to perform this deployment: </p>
+<ul>
+				
+<li>
+					
+<a href="../binaries/JPetStoreAPP4Geronimo.zip">JPetStoreAPP4Geronimo.zip</a>
+				
+</li>
+				
+<li>
+					
+<a class="external" href="http://tomcat.apache.org/download-55.cgi#5.5.12">Tomcat v 5.5.12</a>
+				
+</li>
+			
+</ul>
+<p>Download links for software used in creating this deployment:</p>
+<ul>
+				
+<li>
+					
+<a href="http://db.apache.org/derby/releases/release-10.0.2.1.html">Apache Derby version 10.0.2.1</a> [Note: the *-bin archives contain the documentation as well as Derby].
+          </li>
+				
+<li>
+					
+<a class="external" href="http://prdownloads.sourceforge.net/ibatisjpetstore/iBATIS_JPetStore-4.0.5.zip?download">iBATIS JPetStore version 4.0.5</a>
+				
+</li>
+			
+</ul>
+<p>Learn more:</p>
+<ul>
+				
+<li> The <a href="http://db.apache.org/derby/index.html">Apache Derby Project</a> homepage.
+				</li>
+				
+<li> The <a class="external" href="http://ibatis.apache.org">Apache iBATIS Project</a> homepage. 
+				</li>
+				
+<li>The <a class="external" href="http://tomcat.apache.org">Apache Tomcat Project</a> homepage
+				</li>
+				
+<li> The developerWorks Derby / IBM Cloudscape <a class="external" href="http://www.ibm.com/developerworks/views/db2/libraryview.jsp?product_by=IBM+Cloudscape">Technical Library</a>
+</li>
+				
+<li>Apache Derby <a href="http://db.apache.org/derby/papers/">White Papers</a>
+</li>
+			
+</ul>
+<p>Related articles:</p>
+<ul>
+				
+<li>The Derby difference: <a class="external" href="http://www.ibm.com/developerworks/db2/library/techarticle/dm-0509bradbury/">Using Derby with J2EE Servers</a>
+				
+</li>
+				
+<li>Derby WebSphere deployment of JPetStore  <a href="JPetStoreWebSphere.html">Using Derby with WebSphere to implement iBATIS JPetStore</a>
+				
+</li>
+				
+<li>Derby Geronimo deployment of JPetStore  <a href="JPetStoreGeronimo.html">Using Derby with Geronimo to implement iBATIS JPetStore</a>
+				
+</li>
+			
+</ul>
+<p>
+  Stan Bradbury wrote these instructions.
+  Please post any questions about them 
+  to <a href="../derby_mail.html">derby-user@db.apache.org</a>.
+  </p>
+</div>
+	
+</div>
+<div class="clearboth">&nbsp;</div>
+</div>
+<div id="footer">
+<div class="lastmodified">
+<script type="text/javascript"><!--
+document.write("<text>Last Published:</text> " + document.lastModified);
+//  --></script>
+</div>
+<div class="copyright">
+        Copyright &copy;
+         2004-2005 Apache Software Foundation</div>
+<div id="feedback">
+    Send feedback about the website to:
+  <a id="feedbackto" href="mailto:derby-dev@db.apache.org?subject=Feedback%C2%A0integrate/DerbyTomcat5512JPetStor.html">derby-dev@db.apache.org</a>
+</div>
+</div>
+</body>
+</html>

Propchange: db/derby/site/trunk/build/site/integrate/DerbyTomcat5512JPetStor.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/site/trunk/build/site/integrate/JPetStoreGeronimo.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/JPetStoreGeronimo.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/JPetStoreGeronimo.html (original)
+++ db/derby/site/trunk/build/site/integrate/JPetStoreGeronimo.html Fri Oct 28 17:07:52 2005
@@ -90,13 +90,16 @@
 <a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menupage">
-<div class="menupagetitle">JPetStore Geronimo</div>
+<div class="menupagetitle">Geronimo Demo</div>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Eclipse Plug-ins</div>

Modified: db/derby/site/trunk/build/site/integrate/JPetStoreWebSphere.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/JPetStoreWebSphere.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/JPetStoreWebSphere.html (original)
+++ db/derby/site/trunk/build/site/integrate/JPetStoreWebSphere.html Fri Oct 28 17:07:52 2005
@@ -90,13 +90,16 @@
 <a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
-<div class="menupage">
-<div class="menupagetitle">JPetStore WebSphere</div>
+<div class="menuitem">
+<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menupage">
+<div class="menupagetitle">WebSphere Demo</div>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Eclipse Plug-ins</div>

Modified: db/derby/site/trunk/build/site/integrate/Readme.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/Readme.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/Readme.html (original)
+++ db/derby/site/trunk/build/site/integrate/Readme.html Fri Oct 28 17:07:52 2005
@@ -90,13 +90,16 @@
 <a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

Modified: db/derby/site/trunk/build/site/integrate/db_torque.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/db_torque.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/db_torque.html (original)
+++ db/derby/site/trunk/build/site/integrate/db_torque.html Fri Oct 28 17:07:52 2005
@@ -90,13 +90,16 @@
 <a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menupage">
 <div class="menupagetitle">Torque</div>
+</div>
+<div class="menuitem">
+<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Eclipse Plug-ins</div>

Modified: db/derby/site/trunk/build/site/integrate/derby_plugin.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/derby_plugin.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/derby_plugin.html (original)
+++ db/derby/site/trunk/build/site/integrate/derby_plugin.html Fri Oct 28 17:07:52 2005
@@ -90,13 +90,16 @@
 <a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

Modified: db/derby/site/trunk/build/site/integrate/func_spec_plugins.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/func_spec_plugins.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/func_spec_plugins.html (original)
+++ db/derby/site/trunk/build/site/integrate/func_spec_plugins.html Fri Oct 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

Modified: db/derby/site/trunk/build/site/integrate/index.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/index.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/index.html (original)
+++ db/derby/site/trunk/build/site/integrate/index.html Fri Oct 28 17:07:52 2005
@@ -90,14 +90,17 @@
 <a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../integrate/db_torque.html">Torque</a>
 </div>
+<div class="menuitem">
+<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Eclipse Plug-ins</div>
 <div id="menu_1.2" class="menuitemgroup">
@@ -259,18 +262,17 @@
 
 <tr>
    
-<td colspan="1" rowspan="1">JPetStore Geronimo</td>
+<td colspan="1" rowspan="1">Geronimo Demo</td>
    <td colspan="1" rowspan="1"><em><a href="JPetStoreGeronimo.html">Using Apache Derby with 
          iBATIS JPetStore 4 running on the Geronimo J2EE Server</a></em></td>
 
 </tr>
 
-
 <tr>
    
-<td colspan="1" rowspan="1">JPetStore WebSphere</td>
-   <td colspan="1" rowspan="1"><em><a href="JPetStoreWebSphere.html">Using Apache Derby with 
-         iBATIS JPetStore 4 on the WebSphere Server</a></em></td>
+<td colspan="1" rowspan="1">Tomcat Demo</td>
+   <td colspan="1" rowspan="1"><em><a href="DerbyTomcat5512JPetStor.html">Embedding Apache Derby in
+         Tomcat and creating an iBATIS JPetStore Demo</a></em></td>
 
 </tr>
 
@@ -283,6 +285,16 @@
 </tr>
 
 
+<tr>
+   
+<td colspan="1" rowspan="1">WebSphere Demo</td>
+   <td colspan="1" rowspan="1"><em><a href="JPetStoreWebSphere.html">Using Apache Derby with 
+         iBATIS JPetStore 4 on the WebSphere Server</a></em></td>
+
+</tr>
+
+
+
 </table>
 
 <p>
@@ -352,7 +364,7 @@
 
 
 <p>
-<em>Last Updated: October 6, 2005</em>
+<em>Last Updated: October 28, 2005</em>
 </p>
 
 

Modified: db/derby/site/trunk/build/site/integrate/misc.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/misc.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/misc.html (original)
+++ db/derby/site/trunk/build/site/integrate/misc.html Fri Oct 28 17:07:52 2005
@@ -90,13 +90,16 @@
 <a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Eclipse Plug-ins</div>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/derby_app.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/derby_app.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/derby_app.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/derby_app.html Fri Oct 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/ij.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/ij.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/ij.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/ij.html Fri Oct 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/ij2.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/ij2.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/ij2.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/ij2.html Fri Oct 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/ij_toc.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/ij_toc.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/ij_toc.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/ij_toc.html Fri Oct 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/java_project.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/java_project.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/java_project.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/java_project.html Fri Oct 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/nature.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/nature.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/nature.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/nature.html Fri Oct 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/nature_toc.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/nature_toc.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/nature_toc.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/nature_toc.html Fri Oct 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

Modified: db/derby/site/trunk/build/site/integrate/plugin_help/properties.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/plugin_help/properties.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/plugin_help/properties.html (original)
+++ db/derby/site/trunk/build/site/integrate/plugin_help/properties.html Fri Oct 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

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=329332&r1=329331&r2=329332&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 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

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=329332&r1=329331&r2=329332&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 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

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=329332&r1=329331&r2=329332&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 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

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=329332&r1=329331&r2=329332&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 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

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=329332&r1=329331&r2=329332&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 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

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=329332&r1=329331&r2=329332&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 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

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=329332&r1=329331&r2=329332&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 28 17:07:52 2005
@@ -91,13 +91,16 @@
 <a href="../../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

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=329332&r1=329331&r2=329332&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 28 17:07:52 2005
@@ -90,13 +90,16 @@
 <a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

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=329332&r1=329331&r2=329332&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 28 17:07:52 2005
@@ -90,13 +90,16 @@
 <a href="../binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="../integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="../integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="../integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="../integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="../integrate/JPetStoreWebSphere.html">WebSphere Demo</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>

Modified: db/derby/site/trunk/build/site/linkmap.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/linkmap.html?rev=329332&r1=329331&r2=329332&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/linkmap.html (original)
+++ db/derby/site/trunk/build/site/linkmap.html Fri Oct 28 17:07:52 2005
@@ -246,14 +246,17 @@
 <a href="binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
 </div>
 <div class="menuitem">
-<a href="integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>
+<a href="integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
 </div>
 <div class="menuitem">
-<a href="integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>
+<a href="integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
 </div>
 <div class="menuitem">
 <a href="integrate/db_torque.html">Torque</a>
 </div>
+<div class="menuitem">
+<a href="integrate/JPetStoreWebSphere.html">WebSphere Demo</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">
@@ -961,19 +964,25 @@
       
 <ul>
 <li>
-<a href="integrate/JPetStoreGeronimo.html">JPetStore Geronimo</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>jpetstoreG</em>
+<a href="integrate/JPetStoreGeronimo.html">Geronimo Demo</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>jpetstoreG</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="integrate/JPetStoreWebSphere.html">JPetStore WebSphere</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>jpetstoreW</em>
+<a href="integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tomcat</em>
 </li>
 </ul>
       
 <ul>
 <li>
 <a href="integrate/db_torque.html">Torque</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>torque</em>
+</li>
+</ul>
+      
+<ul>
+<li>
+<a href="integrate/JPetStoreWebSphere.html">WebSphere Demo</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>jpetstoreW</em>
 </li>
 </ul>
   

Added: db/derby/site/trunk/src/documentation/content/xdocs/binaries/DerbyJPetStore4Tomcat.zip
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/binaries/DerbyJPetStore4Tomcat.zip?rev=329332&view=auto
==============================================================================
Binary file - no diff available.

Propchange: db/derby/site/trunk/src/documentation/content/xdocs/binaries/DerbyJPetStore4Tomcat.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: db/derby/site/trunk/src/documentation/content/xdocs/images/TomcatDeploy.gif
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/images/TomcatDeploy.gif?rev=329332&view=auto
==============================================================================
Binary file - no diff available.

Propchange: db/derby/site/trunk/src/documentation/content/xdocs/images/TomcatDeploy.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message