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 [2/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
Added: db/derby/site/trunk/src/documentation/content/xdocs/integrate/DerbyTomcat5512JPetStor.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/integrate/DerbyTomcat5512JPetStor.xml?rev=329332&view=auto
--- db/derby/site/trunk/src/documentation/content/xdocs/integrate/DerbyTomcat5512JPetStor.xml
+++ db/derby/site/trunk/src/documentation/content/xdocs/integrate/DerbyTomcat5512JPetStor.xml
Fri Oct 28 17:07:52 2005
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+	<header>
+		<title>Embedding  Apache Derby in Tomcat and creating an iBATIS JPetStore Demo</title>
+	</header>
+	<body>
+		<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>
+		<note>	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.</note>
+		<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>
+		<section>
+			<title>Why Derby</title>
+			<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> 
+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.
+		</section>
+		<!-- MISC TEXT: 
+The web application used for the demonstration is the freely distributable iBATIS JpetStore
+ -->
+		<section>
+			<title>The Software Components</title>
+			<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>
+		</section>
+		<section>
+			<title>Typographic Conventions Used</title>
+			<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. <code>CATALINA_HOME</code>).</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 <code>derby.log</code> 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  <code>{Derby_System_Home}\Databases</code> subdirectory.
+				<dt>{Derby_Jars}</dt>
+				<dd> The location of the derby jarfiles.  In this installation the location will
be the Tomcat common shared library directory: <code>{Tomcat_Home}/common/lib</code>
+				</dd>
+			</dl>
+		</section>
+		<section>
+			<title>Required Software / Downloads</title>
+			<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 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>
+		</section>
+		<section>
+			<title>Setup of Application with the Datasource in the Global Context:</title>
+			<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 <code>{Tomcat_Home}/conf/server.xml</code>.
 Save a copy of the current server configuration file then add the following definition to
<code>{Tomcat_Home}/conf/server.xml</code>.  The location of the definition must
be in the Global Naming Resources section of the file.  For simplicity locate the end of section
marker <code>&lt;/GlobalNamingResources&gt;</code> and add the  following
lines just above it: <source>
+         &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;
+			</source>
+				</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 <code>Tomcat Web Application Manager
</code> screen.</li>
+				<li>
+					<strong>Deploy the JPetStore application: </strong> Scroll past the application
list to the section labeled: <code>
+Deploy directory or WAR file located on server </code> (see Figure 1).  Enter the following
+         Context Path (optional):   /JPetStoreApp
+      XML Configuration file URL:   work/JPetStoreAppGbl.xml
+            WAR or Directory URL:   work/JPetStoreApp.war
+      </source>
+<note label="Figure 1: Tomcat Manager Deployment Screen" >
+<img src="../images/TomcatDeploy.gif" alt="TomcatDeploy" ></img> 
+      Click the <code>Deploy</code> button to deploy and start the application.
 Check in the message section for the confirmation of a successful deployment: <code>OK
- Deployed application at context path /JPetStoreApp</code>.
+	   </li>
+				<li>
+					<strong>Test the application:</strong> In the <code>Applications</code>
list section, click on the application name in the <code>Path</code> column or
open the application from a new window with the URL: <code>http://{machine-name}:8080/JPetStoreApp</code>
+				</li>
+			</ul>
+					</section>
+		<section>
+			<title>Alternate Setup: Datasource in the Application Context</title>
+			<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 <code>Resource-link</code>
definition found in the <code>JPetStoreAppGbl.xml</code> 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
<code>server.xml</code> 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>
+			<note>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.</note>
+			<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 <code>GlobalNamingResources</code>
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: <code>http://{machine-name}:8080/manager/html</code>).
 Supply a valid username and password to access the <code>Tomcat Web Application Manager</code>
+				<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 <code>Undeploy</code> for JPetStoreApp in the application list</li>
+				<li>
+					<strong>Deploy the JPetStoreA application: </strong> Scroll past the application
list to the section labeled: <code>
+Deploy directory or WAR file located on server</code> (refer to Figure 1).  Enter the
following information:<source>
+         Context Path (optional):   /JPetStoreAppA
+      XML Configuration file URL:   work/JPetStoreAppCntxt.xml
+            WAR or Directory URL:   work/JPetStoreApp.war
+      </source>
+      Click the <code>Deploy</code> button to deploy and start the application.
 Check in the message section for the confirmation of a successful deployment: <code>OK
- Deployed application at context path /JPetStoreAppA</code>.
+	   </li>
+				<li>
+					<strong>Test the application:</strong> In the <code>Applications</code>
list section, click on the application name in the <code>Path</code> column or
open the application from a new window with the URL: <code>http://{machine-name}:8080/JPetStoreAppA</code>
+				</li>
+			</ul>
+		</section>
+		<section>
+			<title>Database Creation Instructions (optional)</title>
+			<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 <code>{Derby_System_Home}\Databases</code>
subdirectory where you will build the database: <code>,jpetstore-derby-schema.sql, jpetstore-derby-dataload.sql</code>.
 Issue the following command to create the database, tables and indexes:
+	<source>
+   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
+	</source>
+				</li>
+				<li>Now load the data into the tables using the following command:
+				<note>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...</note>
+					<source>
+	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
+	</source>
+				</li>
+			</ul>
+			<p>You now have a fully populated database to use with the JPetStore application.</p>
+		</section>
+		<!--			Integration Notes Section			-->
+		<section>
+			<title>General Integration Notes</title>
+			<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>
+		</section>
+		<section>
+			<title>Tomcat Integration Notes</title>
+			<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 (<code>org.apache.catalina.session.StandardManager</code>)
created for each application context (a.k.a. web application) enables <a 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 <code>java:comp</code>
is not accessible when the iBATIS Dao Transaction  Pool is restarted.  This problem is typified
by startup messages in the <code>catalina.log</code> file containing the following
error text: </p>
+<source>org.apache.catalina.session.StandardManager start
+SEVERE: Exception loading sessions from persistent storage
+  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 </source>
+	<note label="Disabling Restart Persistence">The following line in the application
XML configuration file sets the persistence file to an empty string and disables Restart Persistence
for the application:  <code>   &lt;Manager pathname=""/&gt;   </code></note>
+		</section>
+		<section>
+			<title>iBATIS Integration Notes</title>
+			<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 <code>sql-map-config.xml</code> 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:
+			<source>
+   &lt;transactionManager type="JDBC" &gt;
+      &lt;dataSource type="JNDI"&gt;
+         &lt;property name="DBJndiContext" value="jdbc/JPetStoreDB"/&gt;
+      &lt;/dataSource&gt;
+   &lt;/transactionManager&gt;
+   </source>
+				</li>
+				<li>Edit the <code>web.xml</code> file and replace the existing resource-ref
definition with the following:
+      <source>
+      &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>Shareable&lt;/res-sharing-scope&gt;
+   &lt;/resource-ref&gt;
+   </source>
+				</li>
+			</ul>
+		</section>
+		<section  id="Rlinks">
+			<title>Links Section</title>
+			<p>Required Downloads to perform this deployment: </p>
+			<ul>
+				<li>
+					<a href="../binaries/JPetStoreAPP4Geronimo.zip">JPetStoreAPP4Geronimo.zip</a>
+				</li>
+				<li>
+					<a 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-">Apache Derby
version</a> [Note: the *-bin archives contain the documentation as well as
+          </li>
+				<li>
+					<a 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>
+				</li>
+				<li> The <a href="http://ibatis.apache.org">Apache iBATIS Project</a>
+				</li>
+				<li>The <a href="http://tomcat.apache.org">Apache Tomcat Project</a>
+				</li>
+				<li> The developerWorks Derby / IBM Cloudscape <a href="http://www.ibm.com/developerworks/views/db2/libraryview.jsp?product_by=IBM+Cloudscape">Technical
+				<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 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>
+		</section>
+	</body>

Propchange: db/derby/site/trunk/src/documentation/content/xdocs/integrate/DerbyTomcat5512JPetStor.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=329332&r1=329331&r2=329332&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 28 17:07:52
@@ -51,15 +51,14 @@
-   <td>JPetStore Geronimo</td>
+   <td>Geronimo Demo</td>
    <td><em><a href="JPetStoreGeronimo.html">Using Apache Derby with 
          iBATIS JPetStore 4 running on the Geronimo J2EE Server</a></em></td>
-   <td>JPetStore WebSphere</td>
-   <td><em><a href="JPetStoreWebSphere.html">Using Apache Derby with 
-         iBATIS JPetStore 4 on the WebSphere Server</a></em></td>
+   <td>Tomcat Demo</td>
+   <td><em><a href="DerbyTomcat5512JPetStor.html">Embedding Apache Derby
+         Tomcat and creating an iBATIS JPetStore Demo</a></em></td>
@@ -67,6 +66,13 @@
    <td><em><a href="db_torque.html">Running the Torque Tutorial on Derby</a></em></td>
+   <td>WebSphere Demo</td>
+   <td><em><a href="JPetStoreWebSphere.html">Using Apache Derby with 
+         iBATIS JPetStore 4 on the WebSphere Server</a></em></td>
@@ -112,7 +118,7 @@
-<p><em>Last Updated: October 6, 2005</em></p>
+<p><em>Last Updated: October 28, 2005</em></p>

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=329332&r1=329331&r2=329332&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 28 17:07:52 2005
@@ -80,9 +80,10 @@
       <dots      label="DOTS System"  href="../binaries/UsingDotsDerbySystemTest.pdf"/>
       <emma      label="EMMA"         href="../binaries/DerbyCodeCoverageUsingEmma.pdf"/>
       <jonas     label="JOnAS (PDF)"  href="../binaries/DerbyAndRedHatAppServer.pdf" />
-      <jpetstoreG label="JPetStore Geronimo" href="JPetStoreGeronimo.html" />
-      <jpetstoreW label="JPetStore WebSphere" href="JPetStoreWebSphere.html" />
+      <jpetstoreG label="Geronimo Demo" href="JPetStoreGeronimo.html" />
+      <tomcat     label="Tomcat Demo"   href="DerbyTomcat5512JPetStor.html" />
       <torque     label="Torque" href="db_torque.html" />
+      <jpetstoreW label="WebSphere Demo" href="JPetStoreWebSphere.html" />
       <eclipse label="Eclipse Plug-ins" href="integrate/" tab="integrate">

View raw message