This commit was manufactured by cvs2svn to create branch 'Phx1-0'.
diff --git a/.dates.txt b/.dates.txt
index a3d54f6..546e054 100644
--- a/.dates.txt
+++ b/.dates.txt
@@ -2,4 +2,4 @@
 http://www.eclipse.org/birt
 1.0 05/2005 Completed http://www.eclipse.org/birt/index.php?page=project/project_plan_R1_0.html
 1.0.1 07/2005 Planned http://www.eclipse.org/birt/index.php?page=project/project_plan_R1_0_1.html
-2.0 12/2005 Tentative http://www.eclipse.org/birt/index.php?page=project/summary_plan.html
+2.0 12/2005 Tentative http://www.eclipse.org/birt/index.php?page=project/project_plan_R2_0_0_Draft.html
diff --git a/build/install.html b/build/install.html
index 74e7fac..0aa6ea7 100644
--- a/build/install.html
+++ b/build/install.html
@@ -28,7 +28,7 @@
 download page</a>.
 Otherwise, follow along below for detailed steps for installing BIRT.
 <p>
-The instructions here are for the Release 1.0.1 (and later) builds. Please use 1.0.1 or later 
+The instructions here are for the Release 2.0 (and later) builds. Please use 2.0 or later 
 instead of the earlier milestone or stable builds.
 <h1>Java</h1>
 <p>
@@ -42,26 +42,51 @@
 <li>Eclipse 3.0.1, and 3.0.2.
 <li>GEF 3.0.1.
 <li>EMF 2.0.3.
-<li>GEF JRE 1.4.
+<li>JRE 1.4.2.
 </ul>
 And
 <ul>
 <li>Eclipse 3.1.
 <li>GEF 3.1.
 <li>EMF 2.1.
-<li>GEF JRE 1.4/JRE 1.5.
+<li>JRE 1.4.2/JRE 1.5.
 </ul>
 
 
-<p class="caution"><span class="caution-head">Note:</span> Additionally, If you are installing the 2.0 Milestone 1 release you will need
-the following downloads</p>
 
+
+<p class="caution"><span class="caution-head">Note:</span> Additionally, If you are installing the 2.0 you will need
+the following downloads</p>
 <ul>
-<li><a href="http://www.w3.org/2002/06/sacjava-1.3.zip">SAC 1.3</a>.
-<li><a href="http://www.w3.org/2002/06/flutejava-1.3.zip">Flute 1.2</a>.
+<li><a href="http://www.lowagie.com/iText/download.html">iText 1.3</a>.
 </ul>
 <p>
-The SAC APIs are discussed at <a href="http://www.w3.org/Style/CSS/SAC/">Cascading Style Sheets SAC: The Simple API for CSS</a> 
+The iText APIs are discussed at <a href="http://www.lowagie.com/iText/">iText Homepage</a><br> 
+The itext-1.3.jar file needs to be copied to the plugins/org.eclipse.birt.report.engine.emitter.pdf_version/lib directory.
+</p>
+<p>
+Also download Apache Axis 1.2.1. from <a href=http://www.apache.org/dyn/closer.cgi/ws/axis/1_2_1>Apache</a>
+and extract only the six jars listed below into the plugins/org.eclipse.birt.report.viewer_version/birt/WEB-INF/lib directory.
+<ul>
+<li>axis.jar 
+<li>axis-ant.jar 
+<li>commons-discovery-0.2.jar 
+<li>jaxrpc.jar 
+<li>saaj.jar 
+<li>wsdl4j-1.5.1.jar 
+</ul>
+</p>
+<p>
+Lastly download prototype.js v1.4.0 from <a href=http://dev.conio.net/repos/prototype/dist/>dev.conio.net</a>. Copy it into the plugins/org.eclipse.birt.report.viewer_version/birt/ajax/lib directory.
+</p>
+
+<p class="caution"><span class="caution-head">Birt Runtime Note: </span>If you are installing the BIRT Runtime,
+The above files will need to be copied to the birt-runtime-2_0_0\Web Viewer Example directory structure.
+<br>Copy itext-1.3.jar to /Web Viewer Example/plugins/org.eclipse.birt.report.engine.pdf/lib.
+<br>Copy prototype.js to /Web Viewer Example/ajax/lib.
+<br>Copy Axis jars to the /Web Viewer Example/WEB-INF/lib
+<br>
+If you are using the birt.war, you will need to extract it and add the above files.
 </p>
 <br>
 
diff --git a/db/main.html b/db/main.html
index 4feb3f7..4909313 100644
--- a/db/main.html
+++ b/db/main.html
@@ -48,7 +48,6 @@
 <ul>
   <li>Apache Derby database, which is included in the BIRT download </li>
   <li><a href="#MySQL">Scripts to load a MySQL database</a></li>
-  <li><a href="#MS-access">Microsoft Access Database</a></li>
 </ul>
 
 <h2><a name="MySQL">MySQL Version</a></h2>
diff --git a/deploy/birtengine.zip b/deploy/birtengine.zip
index 9f3c165..efcb678 100644
--- a/deploy/birtengine.zip
+++ b/deploy/birtengine.zip
Binary files differ
diff --git a/deploy/engine.html b/deploy/engine.html
index 7ae0dbf..108fb15 100644
--- a/deploy/engine.html
+++ b/deploy/engine.html
@@ -123,6 +123,11 @@
 the engine located in the full BIRT install: 
 /eclipse/plugins/org.eclipse.birt.report.viewer_1.0.1/birt.</p>
 
+<p class="caution"><span class="caution-head">Release 2.0 M3  Note:</span> Please use the
+birt-runtime download when setting the engine home.  The engine home should be set to
+installedlocation/birt-runtime-x_y_z/Report Engine
+</p>
+
 <h2>Emitter Configuration</h2>
 
 <p>An &quot;emitter&quot; is the component of the report engine that produces output. BIRT provides two emitters: HTML and PDF. You'll want to configure the HTML 
@@ -349,6 +354,7 @@
 application</a>.</p>
 <a href="birtengine.zip">Download the sample 
 application Ant project</a>.
+The Ant project has a readme.txt explaining which files need to be copied.
 <p>To run a <a href="test.rptdesign">sample report </a>to HTML, setting the 
 &quot;sample&quot; parameter to the value &quot;Hello&quot;:</p>
 <pre class="code-block">java RunReport test.rptdesign -h sample=Hello</pre>
diff --git a/deploy/viewer-deploy.html b/deploy/viewer-deploy.html
index bf63ced..ac3db6d 100644
--- a/deploy/viewer-deploy.html
+++ b/deploy/viewer-deploy.html
@@ -33,6 +33,7 @@
   <li>Look under the  birt-runtime-&lt;version#&gt; directory and locate the &quot;Web Viewer Example&quot; directory.</li>
   <li>Copy the Web Viewer Example directory to the webapps directory of your 
 Tomcat installation. For ease of reference,  rename the directory to &quot;birt-viewer&quot;.</li>
+  <li>Copy additional files to the directory structure as described in the BIRT Runtime <a href=http://www.eclipse.org/birt/index.php?page=build/install.html>Note</a> 
   <li>Stop, then restart Tomcat.</li>
   <li>Display the Tomcat manager application to check that the 
 viewer is deployed: <a href="http://localhost:8080/manager/html">
@@ -46,10 +47,11 @@
 need to use a context entry within the server.xml file to indicate the 
 deployment location. See Tomcat documentation for details. </p>
 
+<br>
 <h1>Install your JDBC Drivers</h1>
 
 <p>Add the jar files for your JDBC drivers  to the Viewer. They  go in the following directory:</p>
-<p> birt-viewer/WEB-INF/plugins/org.eclipse.birt.report.data.oda.jdbc/drivers</p>
+<p> birt-viewer/plugins/org.eclipse.birt.report.data.oda.jdbc/drivers</p>
 <p>(Note: you must install the drivers both into 
   the Eclipse-based design environment and the deployed viewer environment; these 
 two environments do not share files.)</p>
@@ -58,7 +60,7 @@
 <p>We'll test the viewer further using one of the example reports created for the &quot;Classic Models&quot; database. Note that Classic Models database is included in the birt runtime distribution so no further set-up is required. Follow these steps: 
 <ul>
   <li>Click on the following link to download the example report design, 
-  <a href="../examples/SalesInvoice.rptdesign" target="_blank">SalesInvoice.rptdesign</a> into another browser window. Use the &quot;Save as...&quot; command from the file menu to save the report into the birt-viewer/report directory.</li>
+  <a href="../examples/solution/SalesInvoice.rptdesign" target="_blank">SalesInvoice.rptdesign</a> into another browser window. Use the &quot;Save as...&quot; command from the file menu to save the report into the birt-viewer/report directory.</li>
   <li>If you've installed everything in its default location, then click on the 
   following link. If you've changed anything, then copy the following URL into 
   your browser and make the needed changes.<pre class="code-block"><a href="http://localhost:8080/birt-viewer/frameset?__report=report%5CSalesInvoice.rptdesign" target="_blank">http://localhost:8080/birt-viewer/frameset?__report=report%5CSalesInvoice.rptdesign</a>
diff --git a/deploy/viewer-use.html b/deploy/viewer-use.html
index 941424d..21d017e 100644
--- a/deploy/viewer-use.html
+++ b/deploy/viewer-use.html
@@ -166,6 +166,12 @@
 
 <h2>List of Options </h2>
 
+<p class="caution">
+<span class="caution-head">Release 2.0 Note</span>: 
+The __frame, __toolbar, and __navigation options are obsolete and will only work with
+the 1.0.1 release. 
+</p>
+
 <p>The available viewer options include:</p>
 
 <table class="simple-table">
diff --git a/examples/ClassicLogo.jpg b/examples/images/ClassicLogo.jpg
similarity index 100%
rename from examples/ClassicLogo.jpg
rename to examples/images/ClassicLogo.jpg
Binary files differ
diff --git a/examples/integrating/designengine/index.php b/examples/integrating/designengine/index.php
new file mode 100644
index 0000000..4cafc56
--- /dev/null
+++ b/examples/integrating/designengine/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/integrating/designengine" );
+
+?>
diff --git a/examples/integrating/designengine/main.html b/examples/integrating/designengine/main.html
new file mode 100644
index 0000000..f330725
--- /dev/null
+++ b/examples/integrating/designengine/main.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">Integrating BIRT Examples</p>
+<p class="subhead">BIRT Design Engine API</p>
+
+<h1>Introduction</h1>
+
+<p>
+This example presents a Java program that utilizes the BIRT Design Engine API.
+The BIRT Design Engine API provides the Java developers added flexibility to produce reports 
+programmatically. Using the API, the Design Engine provides the capability to customize 
+elements of the report while integrating this capability into existing enterprise applications.
+</p>
+
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/integrating/DesignEngine/DesignEngine.html" target="_blank" class="top">Design Engine Flash Example</a></dt>
+<dd>This example demonstrates using the Design Engine API.</dd>
+</dl>
+
+<h1>Java Code</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/integrating/DesignEngine/CColumn.java" target="_blank" class="top">CColumn.java</a></dt>
+<dd>Java code used in the demonstration.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/integrating/DesignEngine/TestCColumn.java" target="_blank" class="top">TestCColumn.java</a></dt>
+<dd>Java code used to test the class that uses the Design Engine API.
+</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/integrating/designengine/menu.txt b/examples/integrating/designengine/menu.txt
new file mode 100644
index 0000000..bde6305
--- /dev/null
+++ b/examples/integrating/designengine/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="integrating" 	page="/birt/examples/integrating"/>
+<item-gone name="" 	page=""/>
+</birt-sequence>
diff --git a/examples/integrating/dynamicparameters/index.php b/examples/integrating/dynamicparameters/index.php
new file mode 100644
index 0000000..a7ac7d7
--- /dev/null
+++ b/examples/integrating/dynamicparameters/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/integrating/dynamicparameters" );
+
+?>
diff --git a/examples/integrating/dynamicparameters/main.html b/examples/integrating/dynamicparameters/main.html
new file mode 100644
index 0000000..83eb446
--- /dev/null
+++ b/examples/integrating/dynamicparameters/main.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">Integrating BIRT Examples</p>
+<p class="subhead">BIRT Dynamic Parameters</p>
+
+<h1>Introduction</h1>
+
+<p>
+In this example we will create a BIRT report submission form.  The form will be constructed
+of HTML controls that are dynamically created and populated based on the BIRT report design.  
+Each control will be created as the control type specified when the report 
+parameters were defined during the report design session.  The control's selection list will optionally 
+be populated from the report's database.
+
+For futher information, please review the <a href="http://download.eclipse.org/birt/downloads/examples/integrating/DynamicParameters/readme.doc" target="_blank" class="top">readme</a>.
+</p>
+
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/integrating/DynamicParameters/partOne/part1/part1.html" target="_blank" class="top">Dynamic Parameters Part 1 Flash Example</a></dt>
+<dd>This demonstration shows the final results and what is done in the BIRT design session.</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/integrating/DynamicParameters/partTwo/part2/part2.html" target="_blank" class="top">Dynamic Parameters Part 2 Flash Example</a></dt>
+<dd>This demonstration explains the source code.</dd>
+
+</dl>
+
+<h1>Attachments</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/integrating/DynamicParameters/DynParmsBin.zip" target="_blank" class="top">Deployable Code</a></dt>
+<dd>Jar file, database configuration, SQL script and JSP Page.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/integrating/DynamicParameters/DynParmsSource.zip" target="_blank" class="top">Source Code</a></dt>
+<dd>Source Code for the example.
+</dd>
+
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/integrating/dynamicparameters/menu.txt b/examples/integrating/dynamicparameters/menu.txt
new file mode 100644
index 0000000..bde6305
--- /dev/null
+++ b/examples/integrating/dynamicparameters/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="integrating" 	page="/birt/examples/integrating"/>
+<item-gone name="" 	page=""/>
+</birt-sequence>
diff --git a/examples/integrating/index.php b/examples/integrating/index.php
new file mode 100644
index 0000000..14d9f4f
--- /dev/null
+++ b/examples/integrating/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/integrating" );
+
+?>
diff --git a/examples/integrating/main.html b/examples/integrating/main.html
new file mode 100644
index 0000000..fbdf85d
--- /dev/null
+++ b/examples/integrating/main.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Integration Examples</p>
+<p class="subhead">Integrating BIRT</p>
+
+<h1>Introduction</h1>
+
+<p>This section of Examples focuses on integrating BIRT. The examples listed here focus on using the BIRT APIs, to
+embedd or integrated BIRT.</p>
+
+<dl class="arrow-list">
+<dt><a href="designengine">Design Engine API</a></dt>
+<dd>This example presents a Java program that utilizes the BIRT Design Engine API.</dd>
+
+<dt><a href="dynamicparameters">Dynamic Parameters</a></dt>
+<dd>This example demonstrates using the BIRT APIs to programmatically build a custom parameter page.</dd>
+
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/integrating/menu.txt b/examples/integrating/menu.txt
new file mode 100644
index 0000000..e983e4e
--- /dev/null
+++ b/examples/integrating/menu.txt
@@ -0,0 +1,5 @@
+<birt-menu>
+<top name="examples" page="../../examples"/>
+<item name="design engine" page="designengine"/>
+<item name="dynamic parameters" page="dynamicparameters"/>
+</birt-menu>
\ No newline at end of file
diff --git a/examples/main.html b/examples/main.html
index af12229..963bb90 100644
--- a/examples/main.html
+++ b/examples/main.html
@@ -2,54 +2,53 @@
 <html>
 
 <head>
-<title>BIRT Example Reports</title>
+<title>BIRT Examples</title>
 <link rel="stylesheet" href="../style/compose.css" type="text/css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body>
 
-<p class="head">BIRT Example Reports</p>
-<p class="subhead">A Taste of what you can do with BIRT</p>
+<p class="head">BIRT Examples</p>
+<p class="subhead">Examples to get you started with BIRT</p>
 
 <h1>Introduction</h1>
 
-<p>The example reports here show just a few of the things you can do with BIRT.
-  Unless otherwise noted, the reports are meant to be run against the &quot;Classic Models Inc.&quot; sample database that is included in the BIRT download. </p>
-<p>Preview a report by clicking on the title  link. To try a report for yourself, click on the rptdesign link to display the ROM file, save it to disk and then use File--&gt;Import to bring the file into your Eclipse workspace. If the report uses the Classic Models database, you should be able to run the report immediately. If the report uses another database, follow the instructions provided in the &quot;Other Notes&quot; section of its description. </p>
+<p>
+Weclome to the examples section of the BIRT site.<br>
+Here you will find examples that illustrate some of the features of BIRT.  This section will be changed frequently to add new examples.  The example types are classified below.
+Feel free to make comments within the news group. Let us know what examples you would like to see.
+</p>
+<p>
 
-<h1> Listing</h1>
-
-<dl class="bold-list">
-<dt><a href="ProductCatalog.html" target="_blank" class="top">Product Catalog</a>
-(<a href="ProductCatalog.rptdesign" target="_blank">rptdesign</a>)</dt>
-<dd>Prints the Classic Models product catalog, grouped by product category. 
-Provides product name, cost and description. Demonstrates one level grouping and using a grid within a table row to structure spacing. 
-Also shows image inclusion and use of the <em>&lt;value-of&gt;</em> tag in text item to include 
-the content of a database column. Finally, the report makes  use of styles to simplify maintenance 
-and achieve a consistent look.
-</dd>
-
-<dt><a href="TopSellingProducts.html" target="_blank" class="top">Top Selling Products</a>
-(<a href="TopSellingProducts.rptdesign" target="_blank">rptdesign</a>)</dt>
-<dd>Displays a pie chart showing revenue by product line. Lists the top selling products, sorted by revenue.  Demonstrates use of a chart and sorting a result set.  
-Also shows image inclusion and use of grid and tables to organize report content. Finally, the report makes  use of styles to simplify maintenance 
-and achieve a consistent look.
-</dd>
+<h1>BIRT Demo</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/misc/BIRT/BIRT_demo_Camv3.html" target="_blank" class="top">BIRT Demo</a></dt>
+<dd>This demonstration is a Flash presentation of BIRT that showcases some of its powerful features including summary and line graphs, JavaScript for dynamic images, style usage, highlighting, grouping and detail drill down..</dd>
 </dl>
 
-<h1>Business Forms</h1>
+</p>
 
-<dl class="bold-list">
+<h1>Examples</h1>
 
-<dt><a href="SalesInvoice.html" target="_blank" class="top">Sales Invoice</a>
-(<a href="SalesInvoice.rptdesign" target="_blank">rptdesign</a>)</dt>
-<dd>Prints an invoice for the selected order, including customer and invoice details and products ordered.   Demonstrates use of a parameter to select the order to invoice and expressions for several calculated fields, including discount and order total. Uses expression to build customer address string and illustrates suppression of nulls in database fields with javascript function <em>replace</em>.   
-Also shows image inclusion and sophisticated use of grids and tables to organize report content. Finally, the report makes  use of styles to simplify maintenance 
-and achieve a consistent look.
-</dd>
+<dl class="arrow-list">
+<dt><a href="solution">Solution Reports</a></dt>
+<dd>This section contains several example solution reports, such as Business Forms.</dd>
+
+<dt><a href="reports">Reporting Feature Examples</a></dt>
+<dd>This section demonstrates features and functions of the BIRT Report Designer.</dd>
+
+<dt><a href="scripting">Scripting</a></dt>
+<dd>This section contains examples of scripting within the BIRT Designer</dd>
+
+<dt><a href="integrating">Integrating BIRT</a></dt>
+<dd>This section demonstrates several examples of deploying and using the APIs of BIRT</dd>
+
+<dt>Extending BIRT</dt>
+<dd>This section covers extending the feature set of BIRT, such as Open Data Access (ODA), Report Items, etc</dd>
 
 </dl>
 
+
 </body>
 </html>
\ No newline at end of file
diff --git a/examples/menu.txt b/examples/menu.txt
index 2140eb6..5caa17a 100644
--- a/examples/menu.txt
+++ b/examples/menu.txt
@@ -1,8 +1,8 @@
 <birt-menu>
 <top name="examples" page="../examples"/>
-<item-gone name="grouped list" url="grouped_table.html"/>
-<item-gone name="drop list" url="drop_group_mockup.html"/>
-<item-gone name="side-by-side" url="parallel.html"/>
-<item-gone name="invoice" url="invoice.html"/>
-<item-gone name="bank statement" url="AccountDetails.html"/>
+<item name="solution reports" page="solution"/>
+<item name="report features" page="reports"/>
+<item name="scripting" page="scripting"/>
+<item name="integrating" page="integrating"/>
+<item-gone name="extending" page="extending"/>
 </birt-menu>
\ No newline at end of file
diff --git a/examples/reports/charting/index.php b/examples/reports/charting/index.php
new file mode 100644
index 0000000..5cedc30
--- /dev/null
+++ b/examples/reports/charting/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/charting" );
+
+?>
diff --git a/examples/reports/charting/main.html b/examples/reports/charting/main.html
new file mode 100644
index 0000000..a8025ff
--- /dev/null
+++ b/examples/reports/charting/main.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">BIRT Charting</p>
+
+<h1>Introduction</h1>
+
+<p>Charting is an integral part of data summarization and analysis.
+BIRT provides an excellent package for charting, allowing diverse chart types such as bar charts, pie charts, line charts, scatter charts,
+and stock charts.  Each chart type is also very customizable, offering a wide range of features to better represent data.
+This example demonstrates the use of BIRT's integrated charting package within the
+report designer. The example builds a two dimensional pie chart summarizing product
+revenue by product line.</p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/Charting/Charting.html" target="_blank" class="top">Charting Flash Example</a></dt>
+<dd>This example is intended to illustrate a Charting example within BIRT.</dd>
+</dl>
+
+<h1>Reports</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/Charting/before.html" target="_blank" class="top">Product Revenue by Product Line Before</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/Charting/reports/ChartingExampleBefore.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents product revenue by product line.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/Charting/after.html" target="_blank" class="top">Products Revenue by Product Line After</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/Charting/reports/ChartingExampleAfter.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents product revenue by product line, with the addition of a pie chart, graphically summarizing the data.</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/charting/menu.txt b/examples/reports/charting/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/charting/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/reports/chartingsubreport/index.php b/examples/reports/chartingsubreport/index.php
new file mode 100644
index 0000000..a2a3d5f
--- /dev/null
+++ b/examples/reports/chartingsubreport/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/chartingsubreport" );
+
+?>
diff --git a/examples/reports/chartingsubreport/main.html b/examples/reports/chartingsubreport/main.html
new file mode 100644
index 0000000..19697d3
--- /dev/null
+++ b/examples/reports/chartingsubreport/main.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">BIRT Chart as a Sub Report</p>
+
+<h1>Introduction</h1>
+
+<p>The Report example demonstrates the ability to link a stock chart as a child of a
+parent table. The parent table groups stock price information by month. For each
+month a chart is then displayed graphically depicting the performance of the stock 
+price.
+</p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/ChartSubReport/ChartSubReport.html" target="_blank" class="top">Chart Sub Report Flash Example</a></dt>
+<dd>This example illustrates using a stock chart as a sub report.</dd>
+</dl>
+
+<h1>Reports</h1>
+<dl class="arrow-list">
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/ChartSubReport/after.html" target="_blank" class="top">Graphed Stock Prices</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/ChartSubReport/reports/ChartingExampleStockReportAfter.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a stock price report grouped by month, which also displays the data in a stock chart. The report uses a csv file as a data source.</dd>
+
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/ChartSubReport/table.csv" target="_blank" class="top">Stock Prices CSV file</a></dt>
+<dd>Stock prices in CSV format.  The CSV file is used within the example.</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/chartingsubreport/menu.txt b/examples/reports/chartingsubreport/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/chartingsubreport/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/reports/datasetfilter/index.php b/examples/reports/datasetfilter/index.php
new file mode 100644
index 0000000..cc5a97c
--- /dev/null
+++ b/examples/reports/datasetfilter/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/datasetfilter" );
+
+?>
diff --git a/examples/reports/datasetfilter/main.html b/examples/reports/datasetfilter/main.html
new file mode 100644
index 0000000..0b2de66
--- /dev/null
+++ b/examples/reports/datasetfilter/main.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">BIRT Data Set Filter</p>
+
+<h1>Introduction</h1>
+
+<p>This example is intended to illustrate Data Set filtering within BIRT.
+The ability to apply filters on data sets is a powerful feature of BIRT.
+When integrating data into a report from multiple data sources that may not all provide
+inherent filtering, the data set filter is a powerful way to consistently 
+constrain data to provide the relevant content on which to build reports.
+</p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/DatasetFilter/DatasetFilter.html" target="_blank" class="top">Data Set Filter Flash Example</a></dt>
+<dd>This example is intended to illustrate Data Set filtering within BIRT.</dd>
+</dl>
+
+<h1>Reports</h1>
+<dl class="arrow-list">
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/DatasetFilter/after.html" target="_blank" class="top">Stock Prices</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/DatasetFilter/reports/DatasetFilterExampleAfter.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a stock price report limited by price range using Filters.  The report uses a csv file as a data source.</dd>
+
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/DatasetFilter/table.csv" target="_blank" class="top">Stock Prices CSV file</a></dt>
+<dd>Stock prices in CSV format.  The CSV file is used within the example.</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/datasetfilter/menu.txt b/examples/reports/datasetfilter/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/datasetfilter/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/reports/dynamictext/index.php b/examples/reports/dynamictext/index.php
new file mode 100644
index 0000000..099dcc9
--- /dev/null
+++ b/examples/reports/dynamictext/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/dynamictext" );
+
+?>
diff --git a/examples/reports/dynamictext/main.html b/examples/reports/dynamictext/main.html
new file mode 100644
index 0000000..657f981
--- /dev/null
+++ b/examples/reports/dynamictext/main.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">BIRT Text Element</p>
+
+<h1>Introduction</h1>
+
+<p>
+The look and feel aspects of a report are essential for the end-user experience. 
+BIRT's Text Element allows a broad range of formatting options such as Multi-line text,
+Text that contains multiple style formats and Text that combines static text with dynamic values retrieved at runtime. 
+This example demonstrates the flexible formatting features of the BIRT Dynamic Text feature. 
+</p>
+
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/DynamicText/DynamicText.html" target="_blank" class="top">Dynamic Text Flash Example</a></dt>
+<dd>This example demonstrates flexible formatting using the Text element.</dd>
+</dl>
+
+<h1>Reports</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/DynamicText/before.html" target="_blank" class="top">Customer List Before</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/DynamicText/reports/DynamicTextExampleBefore.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presesents a simple customer list report.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/DynamicText/after.html" target="_blank" class="top">Customer List After</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/DynamicText/reports/DynamicTextExampleAfter.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a customer list with special formatting.
+</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/dynamictext/menu.txt b/examples/reports/dynamictext/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/dynamictext/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/reports/grouping/index.php b/examples/reports/grouping/index.php
new file mode 100644
index 0000000..56d24ba
--- /dev/null
+++ b/examples/reports/grouping/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/grouping" );
+
+?>
diff --git a/examples/reports/grouping/main.html b/examples/reports/grouping/main.html
new file mode 100644
index 0000000..5ce3a86
--- /dev/null
+++ b/examples/reports/grouping/main.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">BIRT Grouping Report</p>
+
+<h1>Introduction</h1>
+
+<p>This example illustrates adding a group section to a listing report.
+To gain deeper insights end-users often need to look at data in a grouped and summarized form. This example demonstrates how to group data in a BIRT report.
+The user is guided through the steps to define and add a group a section.
+</p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/GroupingReport/GroupingReport.html" target="_blank" class="top">Grouping Report Flash Example</a></dt>
+<dd>This example illustrates adding a group section to a listing report.</dd>
+</dl>
+
+<h1>Reports</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/GroupingReport/before.html" target="_blank" class="top">Customer List Before</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/GroupingReport/reports/GroupingExampleBefore.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a simple customer list report.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/GroupingReport/after.html" target="_blank" class="top">Customer List After</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/GroupingReport/reports/GroupingExampleAfter.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a customer list report grouped by country, summing the number of customers per country.
+</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/grouping/menu.txt b/examples/reports/grouping/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/grouping/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/reports/highlighting/index.php b/examples/reports/highlighting/index.php
new file mode 100644
index 0000000..9257c21
--- /dev/null
+++ b/examples/reports/highlighting/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/highlighting" );
+
+?>
diff --git a/examples/reports/highlighting/main.html b/examples/reports/highlighting/main.html
new file mode 100644
index 0000000..481e4a0
--- /dev/null
+++ b/examples/reports/highlighting/main.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">BIRT Highlighting Feature</p>
+
+<h1>Introduction</h1>
+
+<p>This example is intended to illustrate conditional Highlighting within BIRT.</p>
+<p>The report presents a list of the company's current stock of products.  The purchasing agent for the company would like to modify the report
+for readability.  In addition, the agent would also like to highlight rows of data that have low quantities of stock.</p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/highlighting/highlightingFeature.html" target="_blank" class="top">Highlighting Flash Example</a></dt>
+<dd>This example demonstrates the BIRT Highlighting Feature.</dd>
+</dl>
+
+<h1>Reports</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/highlighting/before.html" target="_blank" class="top">Products List Before</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/highlighting/reports/HighlightingExampleBefore.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a list of the current stock of products.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/highlighting/after.html" target="_blank" class="top">Products List After</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/highlighting/reports/HighlightingExampleAfter.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a list of the current stock of products.  The after report includes changes made, using the Highlight feature for readability and low stock indication.
+</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/highlighting/menu.txt b/examples/reports/highlighting/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/highlighting/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/reports/hyperlinking/index.php b/examples/reports/hyperlinking/index.php
new file mode 100644
index 0000000..19284a9
--- /dev/null
+++ b/examples/reports/hyperlinking/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/hyperlinking" );
+
+?>
diff --git a/examples/reports/hyperlinking/main.html b/examples/reports/hyperlinking/main.html
new file mode 100644
index 0000000..412505d
--- /dev/null
+++ b/examples/reports/hyperlinking/main.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">BIRT Hyperlinking Feature</p>
+
+<h1>Introduction</h1>
+
+<p>This example is intended to illustrate Hyperlinking within BIRT.</p>
+<p>This example demonstrates the ability to embed hyperlinks in BIRT reports. You can embed
+links to drill through from one report to another report. You can also embed links to 
+external web sites within a report.</p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/hyperlinking/Hyperlinking.html" target="_blank" class="top">Mapping Flash Example</a></dt>
+<dd>This example demonstrates hyperlinking within BIRT.</dd>
+</dl>
+
+<h1>Reports</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/hyperlinking/before.html" target="_blank" class="top">Sales By Office Before</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/hyperlinking/reports/HyperlinkingExampleBefore.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a list of Sales grouped by Office.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/hyperlinking/after.html" target="_blank" class="top">Sales By Office After</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/hyperlinking/reports/HyperlinkingExampleAfter.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a list of Sales grouped by Office, with Drill to a subreport.  The after report also includes an external hyperlink.  The hyperlink to the detail requires the
+sample be downloaded to your BIRT environment.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/hyperlinking/SalesOfAProduct.html" target="_blank" class="top">Sales for a given Product</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/hyperlinking/reports/SalesOfAProduct.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Detail report used in the hyperlinking example.</dd>
+
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/hyperlinking/menu.txt b/examples/reports/hyperlinking/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/hyperlinking/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/reports/image/index.php b/examples/reports/image/index.php
new file mode 100644
index 0000000..91c5b2f
--- /dev/null
+++ b/examples/reports/image/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/image" );
+
+?>
diff --git a/examples/reports/image/main.html b/examples/reports/image/main.html
new file mode 100644
index 0000000..4d830ad
--- /dev/null
+++ b/examples/reports/image/main.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">BIRT Image Element</p>
+
+<h1>Introduction</h1>
+
+<p>This example demonstrates how BIRT can be used to include images in a report.
+</p>
+<p>Two types of images can be referred to in a report. URI's refer to images read from another location. Images can
+also be embedded within a report design file. A scripted data source is used in this
+example to demonstrate how different images are displayed in a report.  If you intend to try this example, download the images and place them
+in c:\temp.</p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/Image/Image.html" target="_blank" class="top">Image Flash Example</a></dt>
+<dd>This example demonstrates using Images within a BIRT report.</dd>
+</dl>
+
+<h1>Reports</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/Image/after.html" target="_blank" class="top">Image Report</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/Image/reports/ImageExample.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>A simple report that demonstrates using images.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/Image/images.zip" target="_blank" class="top">Images</a></dt>
+<dd>Images used in the example report.</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/image/menu.txt b/examples/reports/image/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/image/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/reports/index.php b/examples/reports/index.php
new file mode 100644
index 0000000..83e4a74
--- /dev/null
+++ b/examples/reports/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports" );
+
+?>
diff --git a/examples/reports/listing/index.php b/examples/reports/listing/index.php
new file mode 100644
index 0000000..4c808e5
--- /dev/null
+++ b/examples/reports/listing/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/listing" );
+
+?>
diff --git a/examples/reports/listing/main.html b/examples/reports/listing/main.html
new file mode 100644
index 0000000..2628cdd
--- /dev/null
+++ b/examples/reports/listing/main.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">BIRT Listing Report</p>
+
+<h1>Introduction</h1>
+
+<p>This example demonstrates the use of BIRT to create a simple listing report.
+Listing reports present data in tabular form and are very popular because of their ease of use. This example demonstrates the use of BIRT to create a simple listing report using data from the 
+sample database bundled with BIRT. The user is guided through the steps to add a data source, define a query and specify the report layout.
+</p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/ListingReport/ListingReport.html" target="_blank" class="top">Listing Report Flash Example</a></dt>
+<dd>This example demonstrates the use of BIRT to create a simple listing report.</dd>
+</dl>
+
+<h1>Reports</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/ListingReport/before.html" target="_blank" class="top">Customer List Before</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/ListingReport/reports/ListingExampleBefore.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Blank report with company header.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/ListingReport/after.html" target="_blank" class="top">Customer List After</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/ListingReport/reports/ListingExampleAfter.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a listing report of customers.
+</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/listing/menu.txt b/examples/reports/listing/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/listing/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/reports/main.html b/examples/reports/main.html
new file mode 100644
index 0000000..69cdd61
--- /dev/null
+++ b/examples/reports/main.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">A showcase of BIRT Features</p>
+
+<h1>Introduction</h1>
+
+<p>This section of Examples focuses on the feature set within BIRT.  Simple reports are used to illustrate a function within
+BIRT.  Most examples will have a before and after report that can be downloaded.  In addition, the example is illustrated
+in a Flash presentation.</p>
+
+<dl class="arrow-list">
+
+<dt><a href="charting">Charting</a></dt>
+<dd>This example demonstrates building a report with several chart types.</dd>
+
+<dt><a href="chartingsubreport">Chart as a Sub Report</a></dt>
+<dd>This example demonstrates building a report that uses a stock chart as a sub report.</dd>
+
+<dt><a href="datasetfilter">Dataset Filtering</a></dt>
+<dd>This example demonstrates the dataset filtering feature.</dd>
+
+<dt><a href="dynamictext">Dynamic Text</a></dt>
+<dd>This example demonstrates using Dynamic Text within a report.</dd>
+
+<dt><a href="grouping">Grouping</a></dt>
+<dd>This example demonstrates building a grouped report.</dd>
+
+<dt><a href="highlighting">Conditional Highlighting</a></dt>
+<dd>This example demonstrates the Highlighting Feature.</dd>
+
+<dt><a href="hyperlinking">Hyperlinking</a></dt>
+<dd>This example demonstrates the ability to embed hyperlinks in BIRT reports.</dd>
+
+<dt><a href="image">Image</a></dt>
+<dd>This example demonstrates using images within a BIRT report.</dd>
+
+<dt><a href="listing">Listing</a></dt>
+<dd>This example demonstrates building a listing report.</dd>
+
+<dt><a href="mapping">Mapping</a></dt>
+<dd>This example demonstrates the Mapping Feature.</dd>
+
+<dt><a href="mysql">MySQL Data Source</a></dt>
+<dd>This example demonstrates configuring BIRT to report against MySQL Data.</dd>
+
+<dt><a href="parallel">Parallel Reports</a></dt>
+<dd>This example demonstrates building BIRT parallel reports.</dd>
+
+<dt><a href="parameters">Parameters</a></dt>
+<dd>This example demonstrates using dataset parameters.</dd>
+
+<dt><a href="subreports">Sub Report</a></dt>
+<dd>This example demonstrates building and linking a subreport.</dd>
+
+</dl>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/mapping/index.php b/examples/reports/mapping/index.php
new file mode 100644
index 0000000..7c9f06e
--- /dev/null
+++ b/examples/reports/mapping/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/mapping" );
+
+?>
diff --git a/examples/reports/mapping/main.html b/examples/reports/mapping/main.html
new file mode 100644
index 0000000..a07611c
--- /dev/null
+++ b/examples/reports/mapping/main.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">BIRT Mapping Feature</p>
+
+<h1>Introduction</h1>
+
+<p>This example is intended to illustrate Mapping within BIRT.</p>
+<p>The report presents a list of customers with their respective credit limits. 
+In the example a new column will be added to the report to display a credit ranking classification.
+The company may use this field for promotional offers.</p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/mapping/MappingFeature.html" target="_blank" class="top">Mapping Flash Example</a></dt>
+<dd>This example demonstrates the BIRT Mapping Feature.</dd>
+</dl>
+
+<h1>Reports</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/mapping/before.html" target="_blank" class="top">Customer Credit Before</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/mapping/reports/MappingExampleBefore.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a list of the customers with their respective credit limits.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/mapping/after.html" target="_blank" class="top">Customer Credit List After</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/mapping/reports/MappingExampleAfter.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a list of the customers with their respective credit limits and classification.  The after report includes changes made, using the Mapping feature for credit limit classification.
+</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/mapping/menu.txt b/examples/reports/mapping/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/mapping/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/reports/menu.txt b/examples/reports/menu.txt
new file mode 100644
index 0000000..72d20b2
--- /dev/null
+++ b/examples/reports/menu.txt
@@ -0,0 +1,17 @@
+<birt-menu>
+<top name="examples" page="../../examples"/>
+<item name="charting" page="charting"/>
+<item name="chart sub report" page="chartingsubreport"/>
+<item name="data set filter" page="datasetfilter"/>
+<item name="dynamic text" page="dynamictext"/>
+<item name="grouping" page="grouping"/>
+<item name="highlighting" page="highlighting"/>
+<item name="hyperlinking" page="hyperlinking"/>
+<item name="image" page="image"/>
+<item name="listing" page="listing"/>
+<item name="mapping" page="mapping"/>
+<item name="mysql" page="mysql"/>
+<item name="parallel reports" page="parallel"/>
+<item name="parameters" page="parameters"/>
+<item name="sub reports" page="subreports"/>
+</birt-menu>
\ No newline at end of file
diff --git a/examples/reports/mysql/index.php b/examples/reports/mysql/index.php
new file mode 100644
index 0000000..897c2e6
--- /dev/null
+++ b/examples/reports/mysql/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/mysql" );
+
+?>
diff --git a/examples/reports/mysql/main.html b/examples/reports/mysql/main.html
new file mode 100644
index 0000000..5ce7544
--- /dev/null
+++ b/examples/reports/mysql/main.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">BIRT MySQL DB Driver Install</p>
+
+<h1>Introduction</h1>
+
+<p>The ability of BIRT reports to access data in a variety of data sources including popular databases such as MySQL
+is a powerful feature.  This example demonstrates the use of BIRT to create reports on data that is stored
+in a MySQL database.
+The user is guided through the steps to create a JDBC data source,
+specify MySQL driver files to use for the BIRT report designer, the standalone BIRT
+report viewer, and the BIRT runtime engine when BIRT reports are deployed under Tomcat.</p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/MySQLDataSource/MySQLDataSource.html" target="_blank" class="top">MySQL Data Source Flash Example</a></dt>
+<dd>This example demonstrates adding the MySQL driver to the BIRT Environment.</dd>
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/mysql/menu.txt b/examples/reports/mysql/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/mysql/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/reports/parallel/index.php b/examples/reports/parallel/index.php
new file mode 100644
index 0000000..886e265
--- /dev/null
+++ b/examples/reports/parallel/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/parallel" );
+
+?>
diff --git a/examples/reports/parallel/main.html b/examples/reports/parallel/main.html
new file mode 100644
index 0000000..da1ec53
--- /dev/null
+++ b/examples/reports/parallel/main.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">Parallel Reports Within BIRT</p>
+
+<h1>Introduction</h1>
+
+<p>The ability to create reports with parallel sections gives the report developer 
+added flexibility and control within the report layout.  This allows for better visualization and data analysis. 
+This example demonstrates the use of BIRT to create reports with parallel sections.
+The example relies on the same data set for two tables that are located side by side. It
+uses table level filters to constrain the data rows that are to be displayed in each
+table.
+</p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/ParallelReports/ParallelReport.html" target="_blank" class="top">Parallel Report Flash Example</a></dt>
+<dd>This example demonstrates building a BIRT parallel report.</dd>
+</dl>
+
+<h1>Reports</h1>
+
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/ParallelReports/after.html" target="_blank" class="top">Employee List After</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/ParallelReports/ParallelReportExampleAfter.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a list of employees by office code and grouped by manager.  Two office codes are used one for each parallel table.
+</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/parallel/menu.txt b/examples/reports/parallel/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/parallel/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/reports/parameters/index.php b/examples/reports/parameters/index.php
new file mode 100644
index 0000000..509064a
--- /dev/null
+++ b/examples/reports/parameters/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/parameters" );
+
+?>
diff --git a/examples/reports/parameters/main.html b/examples/reports/parameters/main.html
new file mode 100644
index 0000000..f2c4998
--- /dev/null
+++ b/examples/reports/parameters/main.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">BIRT Report Parameters</p>
+
+<h1>Introduction</h1>
+
+<p>This example demonstrates how to filter the data in a BIRT report
+at runtime by using report and data set parameters.
+Report parameters allow end-users to interactively filter the report’s data to gain deeper insights.
+The user is guided through the steps to add a dataset parameter and a report parameter.
+</p>
+<p>The report list quantities of stock.  The list of returned products is culled, by adding a where clause to the select statement and using a data set parameter.  The data set parameter
+is then linked with a report parameter.</p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/Parameters/Parameters.html" target="_blank" class="top">Parameterized Report Flash Example</a></dt>
+<dd>This example demonstrates how to filter the data in a BIRT report
+at runtime by using report and data set parameters.</dd>
+</dl>
+
+<h1>Reports</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/Parameters/before.html" target="_blank" class="top">Products List Before</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/Parameters/reports/ParametersExampleBefore.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a simple products list report.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/Parameters/after.html" target="_blank" class="top">Products List After</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/Parameters/reports/ParametersExampleAfter.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a products list culled by a report parameter to show low stock.
+</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/parameters/menu.txt b/examples/reports/parameters/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/parameters/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/reports/subreports/index.php b/examples/reports/subreports/index.php
new file mode 100644
index 0000000..bdf2550
--- /dev/null
+++ b/examples/reports/subreports/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/reports/subreports" );
+
+?>
diff --git a/examples/reports/subreports/main.html b/examples/reports/subreports/main.html
new file mode 100644
index 0000000..6480039
--- /dev/null
+++ b/examples/reports/subreports/main.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Report Examples</p>
+<p class="subhead">Using Sub Reports Within BIRT</p>
+
+<h1>Introduction</h1>
+
+<p>
+Sub reports are a very common type of reports. These are also referred to as Master Detail reports or Parent Child reports.
+BIRT is a flexible tool in that it provides the report developer with the flexibility to design many reports and
+integrate them in sub report fashion via a few clicks of the mouse.
+This example demonstrates the use of BIRT to create reports that are linked together.
+For example, a main customer listing report provides the customer ID as input to a sub 
+report that displays details about each customer.  In this example, a customer purchase report list
+the totals for all customer IDs.  A second report list customer details.  This example combines these two reports.
+</p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/subreports/SubReports.html" target="_blank" class="top">Sub Report Flash Example</a></dt>
+<dd>This example demonstrates the use of BIRT to link from a main to a sub report.</dd>
+</dl>
+
+<h1>Reports</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/subreports/before1.html" target="_blank" class="top">Customer Purchase Main Report Before</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/subreports/reports/SubReportsExampleMainBefore.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>A simple customer total purchase report.
+</dd>
+
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/subreports/before2.html" target="_blank" class="top">Customer Purchase Sub Report Before</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/subreports/reports/SubReportsExampleSubBefore.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>A customer detail report.
+</dd>
+
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/reports/subreports/after.html" target="_blank" class="top">Customer Purchase Report After</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/reports/subreports/reports/SubReportsExampleMainAfter.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>This is the combined Main report and Sub report.
+</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/reports/subreports/menu.txt b/examples/reports/subreports/menu.txt
new file mode 100644
index 0000000..6a39339
--- /dev/null
+++ b/examples/reports/subreports/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="reporting features" 	page="/birt/examples/reports"/>
+<item-gone name="highlighting" 	page="/birt/examples/reports/highlighting"/>
+</birt-sequence>
diff --git a/examples/scripting/index.php b/examples/scripting/index.php
new file mode 100644
index 0000000..01b692b
--- /dev/null
+++ b/examples/scripting/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/scripting" );
+
+?>
diff --git a/examples/scripting/main.html b/examples/scripting/main.html
new file mode 100644
index 0000000..a0716a3
--- /dev/null
+++ b/examples/scripting/main.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Scripting Examples</p>
+<p class="subhead">Scritping within BIRT</p>
+
+<h1>Introduction</h1>
+
+<p>This section of Examples focuses on scripting within BIRT.  Simple reports are used to illustrate scripting
+functionallity.  Most examples will have a before and after report that can be downloaded.  In addition, the example is illustrated
+in a Flash presentation.</p>
+
+<dl class="arrow-list">
+<dt><a href="scripteddatasource">Scripted Data Source</a></dt>
+<dd>This example demonstrates using BIRT scripting to retrieve data for the BIRT report.</dd>
+
+
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/scripting/menu.txt b/examples/scripting/menu.txt
new file mode 100644
index 0000000..6aedcbd
--- /dev/null
+++ b/examples/scripting/menu.txt
@@ -0,0 +1,4 @@
+<birt-menu>
+<top name="examples" page="../../examples"/>
+<item name="scripted datasource" page="scripteddatasource"/>
+</birt-menu>
\ No newline at end of file
diff --git a/examples/scripting/scripteddatasource/index.php b/examples/scripting/scripteddatasource/index.php
new file mode 100644
index 0000000..9b09915
--- /dev/null
+++ b/examples/scripting/scripteddatasource/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/scripting/scripteddatasource" );
+
+?>
diff --git a/examples/scripting/scripteddatasource/main.html b/examples/scripting/scripteddatasource/main.html
new file mode 100644
index 0000000..44bbecc
--- /dev/null
+++ b/examples/scripting/scripteddatasource/main.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Examples</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Scripting Examples</p>
+<p class="subhead">BIRT Scripted Data Source</p>
+
+<h1>Introduction</h1>
+
+<p>This example is intended to illustrate using BIRT's Scripted Data Source.</p>
+<p>This example simulates retrieving results from an online survey.  The results of the survey are accessed using a
+Java Object, which is called from a BIRT Scripted Data Source. </p>
+
+<h1>Demonstration</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/scripting/scripteddatasource/scripteddatasource.html" target="_blank" class="top">Scripted Data Source Flash Example</a></dt>
+<dd>This example demonstrates using a Scripted Data Source, to access data within a BIRT report.</dd>
+</dl>
+
+<h1>Reports</h1>
+<dl class="arrow-list">
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/scripting/scripteddatasource/before.html" target="_blank" class="top">Customer Survey Results Before</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/scripting/scripteddatasource/reports/ScriptedDatasourceExampleBefore.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a list of the current stock of products.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/scripting/scripteddatasource/after.html" target="_blank" class="top">Customer Survey Results After</a>
+(<a href="http://download.eclipse.org/birt/downloads/examples/scripting/scripteddatasource/reports/ScriptedDatasourceExampleAfter.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Presents a list of the current stock of products.  The after report includes changes made, using the Highlight feature for readability and low stock indication.
+</dd>
+
+<dt><a href="http://download.eclipse.org/birt/downloads/examples/scripting/scripteddatasource/javacode/SimpleClass.java" target="_blank" class="top">Sample Java Code</a>
+<dd>Sample Java code used within the example.
+</dd>
+
+</dl>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/scripting/scripteddatasource/menu.txt b/examples/scripting/scripteddatasource/menu.txt
new file mode 100644
index 0000000..08ec74e
--- /dev/null
+++ b/examples/scripting/scripteddatasource/menu.txt
@@ -0,0 +1,5 @@
+<birt-sequence>
+<top name="examples" 			page="/birt/examples"/>
+<top name="scripting" 	page="/birt/examples/scripting"/>
+<item-gone name="" 	page=""/>
+</birt-sequence>
diff --git a/examples/AccountDetails-notes.html b/examples/solution/AccountDetails-notes.html
similarity index 100%
rename from examples/AccountDetails-notes.html
rename to examples/solution/AccountDetails-notes.html
diff --git a/examples/AccountDetails.html b/examples/solution/AccountDetails.html
similarity index 100%
rename from examples/AccountDetails.html
rename to examples/solution/AccountDetails.html
diff --git a/examples/AccountDetails.rptdesign b/examples/solution/AccountDetails.rptdesign
similarity index 99%
rename from examples/AccountDetails.rptdesign
rename to examples/solution/AccountDetails.rptdesign
index ad2317c..7a27bb8 100644
--- a/examples/AccountDetails.rptdesign
+++ b/examples/solution/AccountDetails.rptdesign
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Written by Eclipse BIRT 0.0 (http://www.eclipse.com) -->

-<report xmlns="http://www.eclipse.com/schemas/BIRT_schema.xsd">

-    <property name="createdBy">Eclipse BIRT Designer Version 0.0.1 Build &lt;20050405-1230></property>

-    <property name="units">in</property>

-    <parameters>

-        <scalar-parameter name="accountID">

-            <property name="hidden">false</property>

-            <property name="dataType">decimal</property>

-            <property name="concealValue">false</property>

-            <property name="allowBlank">false</property>

-            <property name="allowNull">false</property>

-            <property name="format">General Number</property>

-            <property name="controlType">text-box</property>

-            <property name="mustMatch">false</property>

-            <property name="fixedOrder">false</property>

-            <expression name="defaultValue">33892</expression>

-        </scalar-parameter>

-    </parameters>

-    <data-sources>

-        <oda-data-source name="Data source">

-            <list-property name="userProperties">

-                <structure>

-                    <property name="name">valid</property>

-                    <property name="type">string</property>

-                </structure>

-            </list-property>

-            <property name="valid">true</property>

-            <property name="driverName">jdbc</property>

-            <list-property name="privateDriverProperties">

-                <ex-property>

-                    <name>ODA:url</name>

-                    <value>jdbc:odbc:BIRT Misc</value>

-                </ex-property>

-                <ex-property>

-                    <name>ODA:user</name>

-                </ex-property>

-                <ex-property>

-                    <name>ODA:password</name>

-                </ex-property>

-                <ex-property>

-                    <name>ODA:driver-class</name>

-                    <value>sun.jdbc.odbc.JdbcOdbcDriver</value>

-                </ex-property>

-            </list-property>

-        </oda-data-source>

-    </data-sources>

-    <data-sets>

-        <oda-data-set name="Data Set">

-            <property name="dataSource">Data source</property>

-            <list-property name="parameters">

-                <structure>

-                    <property name="name">accountID</property>

-                    <property name="dataType">decimal</property>

-                    <property name="position">1</property>

-                    <expression name="defaultValue">33892</expression>

-                    <property name="isOptional">false</property>

-                    <property name="isNullable">false</property>

-                    <property name="isInput">true</property>

-                    <property name="isOutput">false</property>

-                </structure>

-            </list-property>

-            <list-property name="computedColumns">

-                <structure>

-                    <property name="columnName">deposit</property>

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Written by Eclipse BIRT 0.0 (http://www.eclipse.com) -->
+<report xmlns="http://www.eclipse.com/schemas/BIRT_schema.xsd">
+    <property name="createdBy">Eclipse BIRT Designer Version 0.0.1 Build &lt;20050405-1230></property>
+    <property name="units">in</property>
+    <parameters>
+        <scalar-parameter name="accountID">
+            <property name="hidden">false</property>
+            <property name="dataType">decimal</property>
+            <property name="concealValue">false</property>
+            <property name="allowBlank">false</property>
+            <property name="allowNull">false</property>
+            <property name="format">General Number</property>
+            <property name="controlType">text-box</property>
+            <property name="mustMatch">false</property>
+            <property name="fixedOrder">false</property>
+            <expression name="defaultValue">33892</expression>
+        </scalar-parameter>
+    </parameters>
+    <data-sources>
+        <oda-data-source name="Data source">
+            <list-property name="userProperties">
+                <structure>
+                    <property name="name">valid</property>
+                    <property name="type">string</property>
+                </structure>
+            </list-property>
+            <property name="valid">true</property>
+            <property name="driverName">jdbc</property>
+            <list-property name="privateDriverProperties">
+                <ex-property>
+                    <name>ODA:url</name>
+                    <value>jdbc:odbc:BIRT Misc</value>
+                </ex-property>
+                <ex-property>
+                    <name>ODA:user</name>
+                </ex-property>
+                <ex-property>
+                    <name>ODA:password</name>
+                </ex-property>
+                <ex-property>
+                    <name>ODA:driver-class</name>
+                    <value>sun.jdbc.odbc.JdbcOdbcDriver</value>
+                </ex-property>
+            </list-property>
+        </oda-data-source>
+    </data-sources>
+    <data-sets>
+        <oda-data-set name="Data Set">
+            <property name="dataSource">Data source</property>
+            <list-property name="parameters">
+                <structure>
+                    <property name="name">accountID</property>
+                    <property name="dataType">decimal</property>
+                    <property name="position">1</property>
+                    <expression name="defaultValue">33892</expression>
+                    <property name="isOptional">false</property>
+                    <property name="isNullable">false</property>
+                    <property name="isInput">true</property>
+                    <property name="isOutput">false</property>
+                </structure>
+            </list-property>
+            <list-property name="computedColumns">
+                <structure>
+                    <property name="columnName">deposit</property>
                     <expression name="expression">if (row["trans_amt"]>0)
 	row["trans_amt"];
-else null</expression>

-                </structure>

-                <structure>

-                    <property name="columnName">withdrawal</property>

+else null</expression>
+                </structure>
+                <structure>
+                    <property name="columnName">withdrawal</property>
                     <expression name="expression">if (row["trans_amt"]&lt;0)
 	row["trans_amt"];
-else null</expression>

-                </structure>

-            </list-property>

+else null</expression>
+                </structure>
+            </list-property>
             <property name="queryText">SELECT Account.account_id,
        Account.account_nm,
        Account.curr_val,
@@ -83,578 +83,578 @@
        Trans.trans_amt
 FROM  Account, Trans
 WHERE Account.account_id = Trans.account_id
-  AND Trans.account_id = ?</property>

-            <property name="type">JdbcSelectDataSet</property>

-        </oda-data-set>

-    </data-sets>

-    <styles>

-        <style name="date">

-            <property name="dateTimeFormat">:MM/dd/yyyy</property>

-        </style>

-        <style name="bannerLabel">

-            <property name="backgroundColor">#E8D3FE</property>

-            <property name="fontSize">smaller</property>

-            <property name="fontWeight">bold</property>

-            <property name="color">#494949</property>

-            <property name="borderBottomColor">#808080</property>

-            <property name="borderBottomStyle">solid</property>

-            <property name="borderBottomWidth">1px</property>

-            <property name="borderLeftColor">#808080</property>

-            <property name="borderLeftStyle">solid</property>

-            <property name="borderLeftWidth">1px</property>

-            <property name="borderRightColor">#808080</property>

-            <property name="borderRightStyle">solid</property>

-            <property name="borderRightWidth">1px</property>

-            <property name="borderTopColor">#808080</property>

-            <property name="borderTopStyle">solid</property>

-            <property name="borderTopWidth">1px</property>

-            <property name="paddingRight">0.5cm</property>

-            <property name="textAlign">right</property>

-        </style>

-        <style name="bannerData">

-            <property name="fontSize">small</property>

-            <property name="borderBottomColor">#808080</property>

-            <property name="borderBottomStyle">solid</property>

-            <property name="borderBottomWidth">1px</property>

-            <property name="borderLeftColor">#808080</property>

-            <property name="borderLeftStyle">solid</property>

-            <property name="borderLeftWidth">1px</property>

-            <property name="borderRightColor">#808080</property>

-            <property name="borderRightStyle">solid</property>

-            <property name="borderRightWidth">1px</property>

-            <property name="borderTopColor">#808080</property>

-            <property name="borderTopStyle">solid</property>

-            <property name="borderTopWidth">1px</property>

-            <property name="paddingLeft">0.5cm</property>

-        </style>

-        <style name="HeaderCell">

-            <property name="fontSize">smaller</property>

-            <property name="fontWeight">bold</property>

-            <property name="color">#494949</property>

-            <property name="borderBottomColor">#808080</property>

-            <property name="borderBottomStyle">solid</property>

-            <property name="borderBottomWidth">1pt</property>

-            <property name="borderLeftColor">#808080</property>

-            <property name="borderLeftStyle">solid</property>

-            <property name="borderLeftWidth">1pt</property>

-            <property name="borderRightColor">#808080</property>

-            <property name="borderRightStyle">solid</property>

-            <property name="borderRightWidth">1pt</property>

-            <property name="borderTopColor">#808080</property>

-            <property name="borderTopStyle">solid</property>

-            <property name="borderTopWidth">1px</property>

-            <property name="paddingLeft">4pt</property>

-            <property name="paddingRight">4pt</property>

-            <property name="textAlign">center</property>

-        </style>

-        <style name="TableBorder">

-            <property name="borderBottomColor">#808080</property>

-            <property name="borderBottomStyle">solid</property>

-            <property name="borderBottomWidth">thin</property>

-            <property name="borderLeftColor">#808080</property>

-            <property name="borderLeftStyle">solid</property>

-            <property name="borderLeftWidth">1pt</property>

-            <property name="borderRightColor">#808080</property>

-            <property name="borderRightStyle">solid</property>

-            <property name="borderRightWidth">thin</property>

-            <property name="borderTopColor">#808080</property>

-            <property name="borderTopStyle">solid</property>

-            <property name="borderTopWidth">1px</property>

-        </style>

-        <style name="BorderTop">

-            <property name="borderTopColor">#808080</property>

-            <property name="borderTopStyle">solid</property>

-            <property name="borderTopWidth">1px</property>

-        </style>

-        <style name="currency">

-            <property name="numberFormat">###,###.00</property>

-            <property name="textAlign">right</property>

-        </style>

-        <style name="accountID">

-            <property name="numberFormat">:###</property>

-        </style>

-        <style name="report">

-            <property name="fontFamily">sans-serif</property>

-        </style>

-    </styles>

-    <page-setup>

-        <simple-master-page name="Simple MasterPage">

-            <page-header>

-                <grid>

-                    <property name="width">100%</property>

-                    <column/>

-                    <column/>

-                    <row>

-                        <cell>

-                            <property name="fontSize">xx-large</property>

-                            <property name="fontWeight">bold</property>

-                            <property name="textAlign">center</property>

-                            <label>

-                                <text-property name="text">RefCode:</text-property>

-                            </label>

-                        </cell>

-                        <cell>

-                            <property name="fontSize">xx-large</property>

-                            <property name="fontWeight">bold</property>

-                            <property name="textAlign">center</property>

-                            <data>

-                                <expression name="valueExpr">params["refCode"]</expression>

-                            </data>

-                        </cell>

-                    </row>

-                </grid>

-            </page-header>

-            <page-footer>

-                <grid>

-                    <property name="width">100%</property>

-                    <column/>

-                    <column/>

-                    <row>

-                        <cell>

-                            <text>

-                                <property name="contentType">html</property>

-                                <text-property name="content"><![CDATA[<value-of>new Date()</value-of>]]></text-property>

-                            </text>

-                        </cell>

-                        <cell>

-                            <property name="textAlign">right</property>

-                            <text>

-                                <text-property name="content"><![CDATA[Page:]]></text-property>

-                            </text>

-                        </cell>

-                    </row>

-                </grid>

-            </page-footer>

-        </simple-master-page>

-    </page-setup>

-    <body>

-        <list>

-            <property name="dataSet">Data Set</property>

-            <list-property name="paramBindings">

-                <structure>

-                    <property name="paramName">accountID</property>

-                    <expression name="expression">params.accountID</expression>

-                </structure>

-            </list-property>

-            <header>

-                <grid>

-                    <property name="width">100%</property>

-                    <column>

-                        <property name="width">30%</property>

-                    </column>

-                    <column>

-                        <property name="width">20%</property>

-                    </column>

-                    <column>

-                        <property name="width">60%</property>

-                    </column>

-                    <row>

-                        <property name="height">0.5cm</property>

-                        <cell>

-                            <property name="textAlign">right</property>

-                        </cell>

-                        <cell/>

-                        <cell/>

-                    </row>

-                    <row>

-                        <cell>

-                            <property name="textAlign">right</property>

-                            <image>

-                                <expression name="uri">http://www.eclipse.org/birt/examples/bankLogo.jpg</expression>

-                            </image>

-                        </cell>

-                        <cell/>

-                        <cell>

-                            <label>

-                                <property name="fontFamily">Arial Black</property>

-                                <property name="fontSize">x-large</property>

-                                <property name="fontWeight">bold</property>

-                                <property name="color">#700F95</property>

-                                <property name="textAlign">right</property>

-                                <text-property name="text">PERSONAL BANK STATEMENT</text-property>

-                            </label>

-                        </cell>

-                    </row>

-                    <row>

-                        <property name="height">0.5cm</property>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                    </row>

-                </grid>

-                <grid>

-                    <property name="width">100%</property>

-                    <column>

-                        <property name="width">50%</property>

-                    </column>

-                    <column>

-                        <property name="width">50%</property>

-                        <property name="textAlign">left</property>

-                    </column>

-                    <row>

-                        <cell/>

-                        <cell>

-                            <grid>

-                                <property name="style">TableBorder</property>

-                                <property name="width">100%</property>

-                                <column>

-                                    <property name="width">50%</property>

-                                </column>

-                                <column>

-                                    <property name="width">50%</property>

-                                </column>

-                                <row>

-                                    <cell>

-                                        <property name="style">bannerLabel</property>

-                                        <label>

-                                            <text-property name="text">Customer Name:</text-property>

-                                        </label>

-                                    </cell>

-                                    <cell>

-                                        <property name="style">bannerData</property>

-                                        <data>

-                                            <expression name="valueExpr">row["account_nm"]</expression>

-                                        </data>

-                                    </cell>

-                                </row>

-                                <row>

-                                    <cell>

-                                        <property name="style">bannerLabel</property>

-                                        <label>

-                                            <text-property name="text">Address:</text-property>

-                                        </label>

-                                    </cell>

-                                    <cell>

-                                        <property name="style">bannerData</property>

-                                        <data>

-                                            <expression name="valueExpr">row["address"]</expression>

-                                        </data>

-                                    </cell>

-                                </row>

-                                <row>

-                                    <cell>

-                                        <property name="style">bannerLabel</property>

-                                        <label>

-                                            <text-property name="text">Account ID:</text-property>

-                                        </label>

-                                    </cell>

-                                    <cell>

-                                        <property name="style">bannerData</property>

-                                        <data>

-                                            <expression name="valueExpr">row["account_id"]</expression>

-                                        </data>

-                                    </cell>

-                                </row>

-                                <row>

-                                    <cell>

-                                        <property name="style">bannerLabel</property>

-                                        <label>

-                                            <text-property name="text">Opening Balance:</text-property>

-                                        </label>

-                                    </cell>

-                                    <cell>

-                                        <property name="style">bannerData</property>

-                                        <data>

-                                            <property name="style">currency</property>

-                                            <property name="numberFormat">$###,###.00</property>

-                                            <property name="textAlign">left</property>

-                                            <expression name="valueExpr">row["curr_val"]</expression>

-                                        </data>

-                                    </cell>

-                                </row>

-                            </grid>

-                        </cell>

-                    </row>

-                </grid>

-                <grid>

-                    <property name="width">100%</property>

-                    <column>

-                        <property name="width">2cm</property>

-                    </column>

-                    <column>

-                        <property name="width">2cm</property>

-                    </column>

-                    <column>

-                        <property name="width">3cm</property>

-                    </column>

-                    <column>

-                        <property name="width">2cm</property>

-                    </column>

-                    <column>

-                        <property name="width">3cm</property>

-                    </column>

-                    <column/>

-                    <row>

-                        <property name="height">0.5cm</property>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                    </row>

-                    <row>

-                        <cell/>

-                        <cell>

-                            <label>

-                                <property name="fontSize">small</property>

-                                <property name="fontWeight">bold</property>

-                                <property name="color">#3C3C3C</property>

-                                <property name="paddingRight">0.5cm</property>

-                                <property name="textAlign">right</property>

-                                <text-property name="text">From:</text-property>

-                            </label>

-                        </cell>

-                        <cell>

-                            <data>

-                                <property name="fontSize">small</property>

-                                <property name="dateTimeFormat">Short Date</property>

-                                <expression name="valueExpr">Total.min(row["trand_dt"])</expression>

-                            </data>

-                        </cell>

-                        <cell>

-                            <label>

-                                <property name="fontSize">smaller</property>

-                                <property name="fontWeight">bold</property>

-                                <property name="color">#3C3C3C</property>

-                                <property name="paddingRight">0.5cm</property>

-                                <property name="textAlign">right</property>

-                                <text-property name="text">To:</text-property>

-                            </label>

-                        </cell>

-                        <cell>

-                            <data>

-                                <property name="fontSize">small</property>

-                                <property name="dateTimeFormat">Short Date</property>

-                                <expression name="valueExpr">Total.max(row["trand_dt"])</expression>

-                            </data>

-                        </cell>

-                        <cell/>

-                    </row>

-                    <row>

-                        <property name="height">0.5cm</property>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                    </row>

-                </grid>

-                <table>

-                    <property name="style">TableBorder</property>

-                    <property name="fontSize">medium</property>

-                    <property name="verticalAlign">baseline</property>

-                    <property name="width">100%</property>

-                    <method name="onStart"><![CDATA[balance = 0;]]></method>

-                    <list-property name="sort">

-                        <structure>

-                            <expression name="key">row["trand_dt"]</expression>

-                            <property name="direction">asc</property>

-                        </structure>

-                    </list-property>

-                    <column>

-                        <property name="width">10%</property>

-                    </column>

-                    <column>

-                        <property name="width">15%</property>

-                    </column>

-                    <column>

-                        <property name="width">15%</property>

-                    </column>

-                    <column>

-                        <property name="width">15%</property>

-                    </column>

-                    <column>

-                        <property name="width">15%</property>

-                    </column>

-                    <column>

-                        <property name="width">20%</property>

-                    </column>

-                    <header>

-                        <row>

-                            <property name="backgroundColor">#E8D3FE</property>

-                            <cell>

-                                <property name="style">HeaderCell</property>

-                                <label>

-                                    <property name="textAlign">left</property>

-                                    <text-property name="text">Index</text-property>

-                                </label>

-                            </cell>

-                            <cell>

-                                <property name="style">HeaderCell</property>

-                                <label>

-                                    <property name="textAlign">left</property>

-                                    <text-property name="text">Date</text-property>

-                                </label>

-                            </cell>

-                            <cell>

-                                <property name="style">HeaderCell</property>

-                                <label>

-                                    <property name="textAlign">left</property>

-                                    <text-property name="text">Branch</text-property>

-                                </label>

-                            </cell>

-                            <cell>

-                                <property name="style">HeaderCell</property>

-                                <label>

-                                    <property name="textAlign">right</property>

-                                    <text-property name="text">Deposit</text-property>

-                                </label>

-                            </cell>

-                            <cell>

-                                <property name="style">HeaderCell</property>

-                                <label>

-                                    <property name="textAlign">right</property>

-                                    <text-property name="text">Withdraw</text-property>

-                                </label>

-                            </cell>

-                            <cell>

-                                <property name="style">HeaderCell</property>

-                                <property name="paddingRight">5pt</property>

-                                <label>

-                                    <property name="textAlign">right</property>

-                                    <text-property name="text">Balance</text-property>

-                                </label>

-                            </cell>

-                        </row>

-                    </header>

-                    <detail>

-                        <row>

-                            <property name="fontSize">small</property>

-                            <cell>

-                                <property name="paddingLeft">5pt</property>

-                                <data>

-                                    <property name="fontSize">small</property>

-                                    <property name="textAlign">left</property>

-                                    <expression name="valueExpr">row[0] + 1</expression>

-                                </data>

-                            </cell>

-                            <cell>

-                                <property name="paddingLeft">5pt</property>

-                                <data>

-                                    <property name="dateTimeFormat">Short Date</property>

-                                    <property name="textAlign">left</property>

-                                    <expression name="valueExpr">row["trand_dt"]</expression>

-                                </data>

-                            </cell>

-                            <cell>

-                                <property name="paddingLeft">5pt</property>

-                                <data>

-                                    <property name="textAlign">left</property>

-                                    <expression name="valueExpr">row["branch"]</expression>

-                                </data>

-                            </cell>

-                            <cell>

-                                <property name="paddingRight">5pt</property>

-                                <property name="textAlign">right</property>

-                                <data>

-                                    <property name="style">currency</property>

-                                    <property name="numberFormat">###,###.00</property>

-                                    <property name="textAlign">right</property>

-                                    <expression name="valueExpr">row.deposit</expression>

-                                </data>

-                            </cell>

-                            <cell>

-                                <property name="paddingRight">5pt</property>

-                                <property name="textAlign">right</property>

-                                <data>

-                                    <property name="style">currency</property>

-                                    <property name="numberFormat">###,###.00</property>

-                                    <property name="textAlign">right</property>

-                                    <expression name="valueExpr">row.withdrawal</expression>

-                                </data>

-                            </cell>

-                            <cell>

-                                <property name="paddingRight">5pt</property>

-                                <property name="textAlign">right</property>

-                                <data>

-                                    <property name="style">currency</property>

-                                    <property name="numberFormat">###,###.00;(###,###.00)</property>

-                                    <property name="textAlign">right</property>

-                                    <expression name="highlightTestExpr">balance</expression>

-                                    <list-property name="highlightRules">

-                                        <structure>

-                                            <property name="operator">lt</property>

-                                            <property name="color">#FF0000</property>

-                                            <expression name="value1">0</expression>

-                                        </structure>

-                                    </list-property>

-                                    <expression name="valueExpr">balance += row.trans_amt;</expression>

-                                </data>

-                            </cell>

-                        </row>

-                    </detail>

-                    <footer>

-                        <row>

-                            <cell>

-                                <property name="style">BorderTop</property>

-                            </cell>

-                            <cell>

-                                <property name="style">BorderTop</property>

-                            </cell>

-                            <cell>

-                                <property name="style">BorderTop</property>

-                            </cell>

-                            <cell>

-                                <property name="style">BorderTop</property>

-                            </cell>

-                            <cell>

-                                <property name="style">BorderTop</property>

-                                <property name="backgroundColor">#E8D3FE</property>

-                                <property name="borderLeftColor">#808080</property>

-                                <property name="borderLeftStyle">solid</property>

-                                <property name="borderLeftWidth">1px</property>

-                                <property name="borderRightColor">#808080</property>

-                                <property name="borderRightStyle">solid</property>

-                                <property name="borderRightWidth">1px</property>

-                                <label>

-                                    <property name="fontSize">large</property>

-                                    <property name="fontWeight">bold</property>

-                                    <property name="color">#353535</property>

-                                    <property name="textAlign">center</property>

-                                    <text-property name="text">Balance:</text-property>

-                                </label>

-                            </cell>

-                            <cell>

-                                <property name="style">BorderTop</property>

-                                <property name="paddingRight">5pt</property>

-                                <data>

-                                    <property name="style">currency</property>

-                                    <property name="fontSize">large</property>

-                                    <property name="fontWeight">bold</property>

-                                    <property name="color">#353535</property>

-                                    <property name="numberFormat">$###,###.00;($###,###.00)</property>

-                                    <property name="textAlign">right</property>

-                                    <expression name="highlightTestExpr">params.balance</expression>

-                                    <list-property name="highlightRules">

-                                        <structure>

-                                            <property name="operator">lt</property>

-                                            <property name="color">#FF0000</property>

-                                            <expression name="value1">0</expression>

-                                        </structure>

-                                    </list-property>

-                                    <expression name="valueExpr">row.curr_val + Total.sum( row.trans_amt )</expression>

-                                </data>

-                            </cell>

-                        </row>

-                    </footer>

-                </table>

-                <text>

-                    <property name="fontWeight">bold</property>

-                    <property name="color">#700F95</property>

-                    <property name="marginTop">0.5cm</property>

-                    <property name="paddingBottom">0cm</property>

-                    <property name="textAlign">center</property>

-                    <property name="contentType">html</property>

-                    <text-property name="content"><![CDATA[---------*--------*--------*--------*---------*---------*---------*---------*---------*---------*--------*--------]]></text-property>

-                </text>

-            </header>

-        </list>

-    </body>

-    <list-property name="images">

-        <structure>

-            <property name="name">D:\WorkingFiles\SampleDesign\Samples\images\logo1.jpg</property>

+  AND Trans.account_id = ?</property>
+            <property name="type">JdbcSelectDataSet</property>
+        </oda-data-set>
+    </data-sets>
+    <styles>
+        <style name="date">
+            <property name="dateTimeFormat">:MM/dd/yyyy</property>
+        </style>
+        <style name="bannerLabel">
+            <property name="backgroundColor">#E8D3FE</property>
+            <property name="fontSize">smaller</property>
+            <property name="fontWeight">bold</property>
+            <property name="color">#494949</property>
+            <property name="borderBottomColor">#808080</property>
+            <property name="borderBottomStyle">solid</property>
+            <property name="borderBottomWidth">1px</property>
+            <property name="borderLeftColor">#808080</property>
+            <property name="borderLeftStyle">solid</property>
+            <property name="borderLeftWidth">1px</property>
+            <property name="borderRightColor">#808080</property>
+            <property name="borderRightStyle">solid</property>
+            <property name="borderRightWidth">1px</property>
+            <property name="borderTopColor">#808080</property>
+            <property name="borderTopStyle">solid</property>
+            <property name="borderTopWidth">1px</property>
+            <property name="paddingRight">0.5cm</property>
+            <property name="textAlign">right</property>
+        </style>
+        <style name="bannerData">
+            <property name="fontSize">small</property>
+            <property name="borderBottomColor">#808080</property>
+            <property name="borderBottomStyle">solid</property>
+            <property name="borderBottomWidth">1px</property>
+            <property name="borderLeftColor">#808080</property>
+            <property name="borderLeftStyle">solid</property>
+            <property name="borderLeftWidth">1px</property>
+            <property name="borderRightColor">#808080</property>
+            <property name="borderRightStyle">solid</property>
+            <property name="borderRightWidth">1px</property>
+            <property name="borderTopColor">#808080</property>
+            <property name="borderTopStyle">solid</property>
+            <property name="borderTopWidth">1px</property>
+            <property name="paddingLeft">0.5cm</property>
+        </style>
+        <style name="HeaderCell">
+            <property name="fontSize">smaller</property>
+            <property name="fontWeight">bold</property>
+            <property name="color">#494949</property>
+            <property name="borderBottomColor">#808080</property>
+            <property name="borderBottomStyle">solid</property>
+            <property name="borderBottomWidth">1pt</property>
+            <property name="borderLeftColor">#808080</property>
+            <property name="borderLeftStyle">solid</property>
+            <property name="borderLeftWidth">1pt</property>
+            <property name="borderRightColor">#808080</property>
+            <property name="borderRightStyle">solid</property>
+            <property name="borderRightWidth">1pt</property>
+            <property name="borderTopColor">#808080</property>
+            <property name="borderTopStyle">solid</property>
+            <property name="borderTopWidth">1px</property>
+            <property name="paddingLeft">4pt</property>
+            <property name="paddingRight">4pt</property>
+            <property name="textAlign">center</property>
+        </style>
+        <style name="TableBorder">
+            <property name="borderBottomColor">#808080</property>
+            <property name="borderBottomStyle">solid</property>
+            <property name="borderBottomWidth">thin</property>
+            <property name="borderLeftColor">#808080</property>
+            <property name="borderLeftStyle">solid</property>
+            <property name="borderLeftWidth">1pt</property>
+            <property name="borderRightColor">#808080</property>
+            <property name="borderRightStyle">solid</property>
+            <property name="borderRightWidth">thin</property>
+            <property name="borderTopColor">#808080</property>
+            <property name="borderTopStyle">solid</property>
+            <property name="borderTopWidth">1px</property>
+        </style>
+        <style name="BorderTop">
+            <property name="borderTopColor">#808080</property>
+            <property name="borderTopStyle">solid</property>
+            <property name="borderTopWidth">1px</property>
+        </style>
+        <style name="currency">
+            <property name="numberFormat">###,###.00</property>
+            <property name="textAlign">right</property>
+        </style>
+        <style name="accountID">
+            <property name="numberFormat">:###</property>
+        </style>
+        <style name="report">
+            <property name="fontFamily">sans-serif</property>
+        </style>
+    </styles>
+    <page-setup>
+        <simple-master-page name="Simple MasterPage">
+            <page-header>
+                <grid>
+                    <property name="width">100%</property>
+                    <column/>
+                    <column/>
+                    <row>
+                        <cell>
+                            <property name="fontSize">xx-large</property>
+                            <property name="fontWeight">bold</property>
+                            <property name="textAlign">center</property>
+                            <label>
+                                <text-property name="text">RefCode:</text-property>
+                            </label>
+                        </cell>
+                        <cell>
+                            <property name="fontSize">xx-large</property>
+                            <property name="fontWeight">bold</property>
+                            <property name="textAlign">center</property>
+                            <data>
+                                <expression name="valueExpr">params["refCode"]</expression>
+                            </data>
+                        </cell>
+                    </row>
+                </grid>
+            </page-header>
+            <page-footer>
+                <grid>
+                    <property name="width">100%</property>
+                    <column/>
+                    <column/>
+                    <row>
+                        <cell>
+                            <text>
+                                <property name="contentType">html</property>
+                                <text-property name="content"><![CDATA[<value-of>new Date()</value-of>]]></text-property>
+                            </text>
+                        </cell>
+                        <cell>
+                            <property name="textAlign">right</property>
+                            <text>
+                                <text-property name="content"><![CDATA[Page:]]></text-property>
+                            </text>
+                        </cell>
+                    </row>
+                </grid>
+            </page-footer>
+        </simple-master-page>
+    </page-setup>
+    <body>
+        <list>
+            <property name="dataSet">Data Set</property>
+            <list-property name="paramBindings">
+                <structure>
+                    <property name="paramName">accountID</property>
+                    <expression name="expression">params.accountID</expression>
+                </structure>
+            </list-property>
+            <header>
+                <grid>
+                    <property name="width">100%</property>
+                    <column>
+                        <property name="width">30%</property>
+                    </column>
+                    <column>
+                        <property name="width">20%</property>
+                    </column>
+                    <column>
+                        <property name="width">60%</property>
+                    </column>
+                    <row>
+                        <property name="height">0.5cm</property>
+                        <cell>
+                            <property name="textAlign">right</property>
+                        </cell>
+                        <cell/>
+                        <cell/>
+                    </row>
+                    <row>
+                        <cell>
+                            <property name="textAlign">right</property>
+                            <image>
+                                <expression name="uri">http://www.eclipse.org/birt/examples/bankLogo.jpg</expression>
+                            </image>
+                        </cell>
+                        <cell/>
+                        <cell>
+                            <label>
+                                <property name="fontFamily">Arial Black</property>
+                                <property name="fontSize">x-large</property>
+                                <property name="fontWeight">bold</property>
+                                <property name="color">#700F95</property>
+                                <property name="textAlign">right</property>
+                                <text-property name="text">PERSONAL BANK STATEMENT</text-property>
+                            </label>
+                        </cell>
+                    </row>
+                    <row>
+                        <property name="height">0.5cm</property>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                    </row>
+                </grid>
+                <grid>
+                    <property name="width">100%</property>
+                    <column>
+                        <property name="width">50%</property>
+                    </column>
+                    <column>
+                        <property name="width">50%</property>
+                        <property name="textAlign">left</property>
+                    </column>
+                    <row>
+                        <cell/>
+                        <cell>
+                            <grid>
+                                <property name="style">TableBorder</property>
+                                <property name="width">100%</property>
+                                <column>
+                                    <property name="width">50%</property>
+                                </column>
+                                <column>
+                                    <property name="width">50%</property>
+                                </column>
+                                <row>
+                                    <cell>
+                                        <property name="style">bannerLabel</property>
+                                        <label>
+                                            <text-property name="text">Customer Name:</text-property>
+                                        </label>
+                                    </cell>
+                                    <cell>
+                                        <property name="style">bannerData</property>
+                                        <data>
+                                            <expression name="valueExpr">row["account_nm"]</expression>
+                                        </data>
+                                    </cell>
+                                </row>
+                                <row>
+                                    <cell>
+                                        <property name="style">bannerLabel</property>
+                                        <label>
+                                            <text-property name="text">Address:</text-property>
+                                        </label>
+                                    </cell>
+                                    <cell>
+                                        <property name="style">bannerData</property>
+                                        <data>
+                                            <expression name="valueExpr">row["address"]</expression>
+                                        </data>
+                                    </cell>
+                                </row>
+                                <row>
+                                    <cell>
+                                        <property name="style">bannerLabel</property>
+                                        <label>
+                                            <text-property name="text">Account ID:</text-property>
+                                        </label>
+                                    </cell>
+                                    <cell>
+                                        <property name="style">bannerData</property>
+                                        <data>
+                                            <expression name="valueExpr">row["account_id"]</expression>
+                                        </data>
+                                    </cell>
+                                </row>
+                                <row>
+                                    <cell>
+                                        <property name="style">bannerLabel</property>
+                                        <label>
+                                            <text-property name="text">Opening Balance:</text-property>
+                                        </label>
+                                    </cell>
+                                    <cell>
+                                        <property name="style">bannerData</property>
+                                        <data>
+                                            <property name="style">currency</property>
+                                            <property name="numberFormat">$###,###.00</property>
+                                            <property name="textAlign">left</property>
+                                            <expression name="valueExpr">row["curr_val"]</expression>
+                                        </data>
+                                    </cell>
+                                </row>
+                            </grid>
+                        </cell>
+                    </row>
+                </grid>
+                <grid>
+                    <property name="width">100%</property>
+                    <column>
+                        <property name="width">2cm</property>
+                    </column>
+                    <column>
+                        <property name="width">2cm</property>
+                    </column>
+                    <column>
+                        <property name="width">3cm</property>
+                    </column>
+                    <column>
+                        <property name="width">2cm</property>
+                    </column>
+                    <column>
+                        <property name="width">3cm</property>
+                    </column>
+                    <column/>
+                    <row>
+                        <property name="height">0.5cm</property>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                    </row>
+                    <row>
+                        <cell/>
+                        <cell>
+                            <label>
+                                <property name="fontSize">small</property>
+                                <property name="fontWeight">bold</property>
+                                <property name="color">#3C3C3C</property>
+                                <property name="paddingRight">0.5cm</property>
+                                <property name="textAlign">right</property>
+                                <text-property name="text">From:</text-property>
+                            </label>
+                        </cell>
+                        <cell>
+                            <data>
+                                <property name="fontSize">small</property>
+                                <property name="dateTimeFormat">Short Date</property>
+                                <expression name="valueExpr">Total.min(row["trand_dt"])</expression>
+                            </data>
+                        </cell>
+                        <cell>
+                            <label>
+                                <property name="fontSize">smaller</property>
+                                <property name="fontWeight">bold</property>
+                                <property name="color">#3C3C3C</property>
+                                <property name="paddingRight">0.5cm</property>
+                                <property name="textAlign">right</property>
+                                <text-property name="text">To:</text-property>
+                            </label>
+                        </cell>
+                        <cell>
+                            <data>
+                                <property name="fontSize">small</property>
+                                <property name="dateTimeFormat">Short Date</property>
+                                <expression name="valueExpr">Total.max(row["trand_dt"])</expression>
+                            </data>
+                        </cell>
+                        <cell/>
+                    </row>
+                    <row>
+                        <property name="height">0.5cm</property>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                    </row>
+                </grid>
+                <table>
+                    <property name="style">TableBorder</property>
+                    <property name="fontSize">medium</property>
+                    <property name="verticalAlign">baseline</property>
+                    <property name="width">100%</property>
+                    <method name="onStart"><![CDATA[balance = 0;]]></method>
+                    <list-property name="sort">
+                        <structure>
+                            <expression name="key">row["trand_dt"]</expression>
+                            <property name="direction">asc</property>
+                        </structure>
+                    </list-property>
+                    <column>
+                        <property name="width">10%</property>
+                    </column>
+                    <column>
+                        <property name="width">15%</property>
+                    </column>
+                    <column>
+                        <property name="width">15%</property>
+                    </column>
+                    <column>
+                        <property name="width">15%</property>
+                    </column>
+                    <column>
+                        <property name="width">15%</property>
+                    </column>
+                    <column>
+                        <property name="width">20%</property>
+                    </column>
+                    <header>
+                        <row>
+                            <property name="backgroundColor">#E8D3FE</property>
+                            <cell>
+                                <property name="style">HeaderCell</property>
+                                <label>
+                                    <property name="textAlign">left</property>
+                                    <text-property name="text">Index</text-property>
+                                </label>
+                            </cell>
+                            <cell>
+                                <property name="style">HeaderCell</property>
+                                <label>
+                                    <property name="textAlign">left</property>
+                                    <text-property name="text">Date</text-property>
+                                </label>
+                            </cell>
+                            <cell>
+                                <property name="style">HeaderCell</property>
+                                <label>
+                                    <property name="textAlign">left</property>
+                                    <text-property name="text">Branch</text-property>
+                                </label>
+                            </cell>
+                            <cell>
+                                <property name="style">HeaderCell</property>
+                                <label>
+                                    <property name="textAlign">right</property>
+                                    <text-property name="text">Deposit</text-property>
+                                </label>
+                            </cell>
+                            <cell>
+                                <property name="style">HeaderCell</property>
+                                <label>
+                                    <property name="textAlign">right</property>
+                                    <text-property name="text">Withdraw</text-property>
+                                </label>
+                            </cell>
+                            <cell>
+                                <property name="style">HeaderCell</property>
+                                <property name="paddingRight">5pt</property>
+                                <label>
+                                    <property name="textAlign">right</property>
+                                    <text-property name="text">Balance</text-property>
+                                </label>
+                            </cell>
+                        </row>
+                    </header>
+                    <detail>
+                        <row>
+                            <property name="fontSize">small</property>
+                            <cell>
+                                <property name="paddingLeft">5pt</property>
+                                <data>
+                                    <property name="fontSize">small</property>
+                                    <property name="textAlign">left</property>
+                                    <expression name="valueExpr">row[0] + 1</expression>
+                                </data>
+                            </cell>
+                            <cell>
+                                <property name="paddingLeft">5pt</property>
+                                <data>
+                                    <property name="dateTimeFormat">Short Date</property>
+                                    <property name="textAlign">left</property>
+                                    <expression name="valueExpr">row["trand_dt"]</expression>
+                                </data>
+                            </cell>
+                            <cell>
+                                <property name="paddingLeft">5pt</property>
+                                <data>
+                                    <property name="textAlign">left</property>
+                                    <expression name="valueExpr">row["branch"]</expression>
+                                </data>
+                            </cell>
+                            <cell>
+                                <property name="paddingRight">5pt</property>
+                                <property name="textAlign">right</property>
+                                <data>
+                                    <property name="style">currency</property>
+                                    <property name="numberFormat">###,###.00</property>
+                                    <property name="textAlign">right</property>
+                                    <expression name="valueExpr">row.deposit</expression>
+                                </data>
+                            </cell>
+                            <cell>
+                                <property name="paddingRight">5pt</property>
+                                <property name="textAlign">right</property>
+                                <data>
+                                    <property name="style">currency</property>
+                                    <property name="numberFormat">###,###.00</property>
+                                    <property name="textAlign">right</property>
+                                    <expression name="valueExpr">row.withdrawal</expression>
+                                </data>
+                            </cell>
+                            <cell>
+                                <property name="paddingRight">5pt</property>
+                                <property name="textAlign">right</property>
+                                <data>
+                                    <property name="style">currency</property>
+                                    <property name="numberFormat">###,###.00;(###,###.00)</property>
+                                    <property name="textAlign">right</property>
+                                    <expression name="highlightTestExpr">balance</expression>
+                                    <list-property name="highlightRules">
+                                        <structure>
+                                            <property name="operator">lt</property>
+                                            <property name="color">#FF0000</property>
+                                            <expression name="value1">0</expression>
+                                        </structure>
+                                    </list-property>
+                                    <expression name="valueExpr">balance += row.trans_amt;</expression>
+                                </data>
+                            </cell>
+                        </row>
+                    </detail>
+                    <footer>
+                        <row>
+                            <cell>
+                                <property name="style">BorderTop</property>
+                            </cell>
+                            <cell>
+                                <property name="style">BorderTop</property>
+                            </cell>
+                            <cell>
+                                <property name="style">BorderTop</property>
+                            </cell>
+                            <cell>
+                                <property name="style">BorderTop</property>
+                            </cell>
+                            <cell>
+                                <property name="style">BorderTop</property>
+                                <property name="backgroundColor">#E8D3FE</property>
+                                <property name="borderLeftColor">#808080</property>
+                                <property name="borderLeftStyle">solid</property>
+                                <property name="borderLeftWidth">1px</property>
+                                <property name="borderRightColor">#808080</property>
+                                <property name="borderRightStyle">solid</property>
+                                <property name="borderRightWidth">1px</property>
+                                <label>
+                                    <property name="fontSize">large</property>
+                                    <property name="fontWeight">bold</property>
+                                    <property name="color">#353535</property>
+                                    <property name="textAlign">center</property>
+                                    <text-property name="text">Balance:</text-property>
+                                </label>
+                            </cell>
+                            <cell>
+                                <property name="style">BorderTop</property>
+                                <property name="paddingRight">5pt</property>
+                                <data>
+                                    <property name="style">currency</property>
+                                    <property name="fontSize">large</property>
+                                    <property name="fontWeight">bold</property>
+                                    <property name="color">#353535</property>
+                                    <property name="numberFormat">$###,###.00;($###,###.00)</property>
+                                    <property name="textAlign">right</property>
+                                    <expression name="highlightTestExpr">params.balance</expression>
+                                    <list-property name="highlightRules">
+                                        <structure>
+                                            <property name="operator">lt</property>
+                                            <property name="color">#FF0000</property>
+                                            <expression name="value1">0</expression>
+                                        </structure>
+                                    </list-property>
+                                    <expression name="valueExpr">row.curr_val + Total.sum( row.trans_amt )</expression>
+                                </data>
+                            </cell>
+                        </row>
+                    </footer>
+                </table>
+                <text>
+                    <property name="fontWeight">bold</property>
+                    <property name="color">#700F95</property>
+                    <property name="marginTop">0.5cm</property>
+                    <property name="paddingBottom">0cm</property>
+                    <property name="textAlign">center</property>
+                    <property name="contentType">html</property>
+                    <text-property name="content"><![CDATA[---------*--------*--------*--------*---------*---------*---------*---------*---------*---------*--------*--------]]></text-property>
+                </text>
+            </header>
+        </list>
+    </body>
+    <list-property name="images">
+        <structure>
+            <property name="name">D:\WorkingFiles\SampleDesign\Samples\images\logo1.jpg</property>
             <property name="data">
                 /9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAZAAA/+4ADkFkb2JlAGTAAAAAAf/bAIQA
                 AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgICAwMDAwMD
@@ -837,7 +837,7 @@
                 ruzP0JHVNHuF7XZgBI1CxTj59GQyJUwSI1gYYyoRECyTTD0lQZoIIlD7ih55ZcNxvA8diMODs7e1VvrG
                 NFVnPjV3pvc/F2Y/HU1jsPisQhjxlvFAD4lFALfFm+sx+LEnVX8mtSWnGmnGmnGmnGmnGmnGmnGmnGmn
                 GmnGmnGmnGmnGmnGmnGmnGmnGmnGmnGmnGmnGmnGmv/Z
-            </property>

-        </structure>

-    </list-property>

-</report>

+            </property>
+        </structure>
+    </list-property>
+</report>
diff --git a/examples/ClassicLogo.jpg b/examples/solution/ClassicLogo.jpg
similarity index 100%
copy from examples/ClassicLogo.jpg
copy to examples/solution/ClassicLogo.jpg
Binary files differ
diff --git a/examples/ProductCatalog.html b/examples/solution/ProductCatalog.html
similarity index 100%
rename from examples/ProductCatalog.html
rename to examples/solution/ProductCatalog.html
diff --git a/examples/ProductCatalog.rptdesign b/examples/solution/ProductCatalog.rptdesign
similarity index 100%
rename from examples/ProductCatalog.rptdesign
rename to examples/solution/ProductCatalog.rptdesign
diff --git a/examples/SalesInvoice.html b/examples/solution/SalesInvoice.html
similarity index 100%
rename from examples/SalesInvoice.html
rename to examples/solution/SalesInvoice.html
diff --git a/examples/SalesInvoice.rptdesign b/examples/solution/SalesInvoice.rptdesign
similarity index 100%
rename from examples/SalesInvoice.rptdesign
rename to examples/solution/SalesInvoice.rptdesign
diff --git a/examples/SalesPie.png b/examples/solution/SalesPie.png
similarity index 100%
rename from examples/SalesPie.png
rename to examples/solution/SalesPie.png
Binary files differ
diff --git a/examples/TopSellingProducts.html b/examples/solution/TopSellingProducts.html
similarity index 100%
rename from examples/TopSellingProducts.html
rename to examples/solution/TopSellingProducts.html
diff --git a/examples/TopSellingProducts.rptdesign b/examples/solution/TopSellingProducts.rptdesign
similarity index 100%
rename from examples/TopSellingProducts.rptdesign
rename to examples/solution/TopSellingProducts.rptdesign
diff --git a/examples/bankLogo.jpg b/examples/solution/bankLogo.jpg
similarity index 100%
rename from examples/bankLogo.jpg
rename to examples/solution/bankLogo.jpg
Binary files differ
diff --git a/examples/drop_group_mockup.html b/examples/solution/drop_group_mockup.html
similarity index 100%
rename from examples/drop_group_mockup.html
rename to examples/solution/drop_group_mockup.html
diff --git a/examples/grouped_table.html b/examples/solution/grouped_table.html
similarity index 100%
rename from examples/grouped_table.html
rename to examples/solution/grouped_table.html
diff --git a/examples/grouped_table.rptdesign b/examples/solution/grouped_table.rptdesign
similarity index 99%
rename from examples/grouped_table.rptdesign
rename to examples/solution/grouped_table.rptdesign
index 5d5e04d..b977060 100644
--- a/examples/grouped_table.rptdesign
+++ b/examples/solution/grouped_table.rptdesign
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Written by Eclipse BIRT 1.0 -->

-<report xmlns=" http://www.eclipse.org/birt/2005/design" version="1">

-    <property name="units">in</property>

-    <data-sources>

-        <oda-data-source extensionName="jdbc" name="sfdata">

-            <list-property name="userProperties">

-                <structure>

-                    <property name="name">valid</property>

-                    <property name="type">string</property>

-                </structure>

-            </list-property>

-            <property name="valid">true</property>

-            <property name="driverName">jdbc</property>

-            <property name="odaDriverClass">sun.jdbc.odbc.JdbcOdbcDriver</property>

-            <property name="odaURL">jdbc:odbc:sfdata</property>

-            <property name="odaUser"></property>

-            <property name="odaPassword"></property>

-        </oda-data-source>

-    </data-sources>

-    <data-sets>

-        <oda-data-set name="Customers">

-            <property name="dataSource">sfdata</property>

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Written by Eclipse BIRT 1.0 -->
+<report xmlns=" http://www.eclipse.org/birt/2005/design" version="1">
+    <property name="units">in</property>
+    <data-sources>
+        <oda-data-source extensionName="jdbc" name="sfdata">
+            <list-property name="userProperties">
+                <structure>
+                    <property name="name">valid</property>
+                    <property name="type">string</property>
+                </structure>
+            </list-property>
+            <property name="valid">true</property>
+            <property name="driverName">jdbc</property>
+            <property name="odaDriverClass">sun.jdbc.odbc.JdbcOdbcDriver</property>
+            <property name="odaURL">jdbc:odbc:sfdata</property>
+            <property name="odaUser"></property>
+            <property name="odaPassword"></property>
+        </oda-data-source>
+    </data-sources>
+    <data-sets>
+        <oda-data-set name="Customers">
+            <property name="dataSource">sfdata</property>
             <property name="queryText">SELECT customers.custID,
         customers.contact_last,
         customers.contact_first,
@@ -35,104 +35,104 @@
         customers.purchaseVolume,
         customers.repID 
  FROM customers
- WHERE state &lt; 'N'</property>

-            <property name="type">JdbcSelectDataSet</property>

-        </oda-data-set>

-    </data-sets>

-    <styles>

-        <style name="Header">

-            <property name="backgroundColor">#CCCCFF</property>

-            <property name="fontFamily">sans-serif</property>

-            <property name="fontSize">small</property>

-            <property name="fontWeight">bold</property>

-        </style>

-        <style name="Phone">

-            <structure name="stringFormat">

-                <property name="category">Custom</property>

-                <property name="pattern">(@@@) @@@-@@@@</property>

-            </structure>

-        </style>

-        <style name="Gray">

-            <property name="backgroundColor">#DADADA</property>

-        </style>

-        <style name="Lt. Gray">

-            <property name="backgroundColor">#E6E6E6</property>

-        </style>

-        <style name="Title">

-            <property name="fontFamily">sans-serif</property>

-        </style>

-        <style name="report">

-            <property name="fontFamily">sans-serif</property>

-        </style>

-    </styles>

-    <page-setup>

-        <simple-master-page name="Simple MasterPage">

-            <page-header>

-                <grid>

-                    <property name="width">100%</property>

-                    <column/>

-                    <row>

-                        <cell>

-                            <property name="fontSize">xx-large</property>

-                            <property name="fontWeight">bold</property>

-                            <property name="textAlign">center</property>

-                            <text>

-                                <text-property name="content"><![CDATA[Title]]></text-property>

-                            </text>

-                        </cell>

-                    </row>

-                </grid>

-            </page-header>

-            <page-footer>

-                <grid>

-                    <property name="width">100%</property>

-                    <column/>

-                    <column/>

-                    <row>

-                        <cell>

-                            <text>

-                                <property name="contentType">html</property>

-                                <text-property name="content"><![CDATA[<value-of>new Date()</value-of>]]></text-property>

-                            </text>

-                        </cell>

-                        <cell>

-                            <property name="textAlign">right</property>

-                            <text>

-                                <text-property name="content"><![CDATA[Page:]]></text-property>

-                            </text>

-                        </cell>

-                    </row>

-                </grid>

-            </page-footer>

-        </simple-master-page>

-    </page-setup>

-    <body>

-        <grid>

-            <property name="width">100%</property>

-            <column>

-                <property name="width">33.3%</property>

-            </column>

-            <column>

-                <property name="width">33.3%</property>

-                <property name="verticalAlign">top</property>

-            </column>

-            <column>

-                <property name="width">33.4%</property>

-            </column>

-            <row>

-                <cell>

-                    <property name="verticalAlign">top</property>

-                    <image>

-                        <property name="height">0.594in</property>

-                        <property name="width">2.104in</property>

-                        <expression name="uri">http://www.eclipse.org/birt/examples/multichip-4.jpg</expression>

-                    </image>

-                </cell>

-                <cell>

-                    <property name="verticalAlign">top</property>

-                    <text>

-                        <property name="style">Title</property>

-                        <property name="contentType">html</property>

+ WHERE state &lt; 'N'</property>
+            <property name="type">JdbcSelectDataSet</property>
+        </oda-data-set>
+    </data-sets>
+    <styles>
+        <style name="Header">
+            <property name="backgroundColor">#CCCCFF</property>
+            <property name="fontFamily">sans-serif</property>
+            <property name="fontSize">small</property>
+            <property name="fontWeight">bold</property>
+        </style>
+        <style name="Phone">
+            <structure name="stringFormat">
+                <property name="category">Custom</property>
+                <property name="pattern">(@@@) @@@-@@@@</property>
+            </structure>
+        </style>
+        <style name="Gray">
+            <property name="backgroundColor">#DADADA</property>
+        </style>
+        <style name="Lt. Gray">
+            <property name="backgroundColor">#E6E6E6</property>
+        </style>
+        <style name="Title">
+            <property name="fontFamily">sans-serif</property>
+        </style>
+        <style name="report">
+            <property name="fontFamily">sans-serif</property>
+        </style>
+    </styles>
+    <page-setup>
+        <simple-master-page name="Simple MasterPage">
+            <page-header>
+                <grid>
+                    <property name="width">100%</property>
+                    <column/>
+                    <row>
+                        <cell>
+                            <property name="fontSize">xx-large</property>
+                            <property name="fontWeight">bold</property>
+                            <property name="textAlign">center</property>
+                            <text>
+                                <text-property name="content"><![CDATA[Title]]></text-property>
+                            </text>
+                        </cell>
+                    </row>
+                </grid>
+            </page-header>
+            <page-footer>
+                <grid>
+                    <property name="width">100%</property>
+                    <column/>
+                    <column/>
+                    <row>
+                        <cell>
+                            <text>
+                                <property name="contentType">html</property>
+                                <text-property name="content"><![CDATA[<value-of>new Date()</value-of>]]></text-property>
+                            </text>
+                        </cell>
+                        <cell>
+                            <property name="textAlign">right</property>
+                            <text>
+                                <text-property name="content"><![CDATA[Page:]]></text-property>
+                            </text>
+                        </cell>
+                    </row>
+                </grid>
+            </page-footer>
+        </simple-master-page>
+    </page-setup>
+    <body>
+        <grid>
+            <property name="width">100%</property>
+            <column>
+                <property name="width">33.3%</property>
+            </column>
+            <column>
+                <property name="width">33.3%</property>
+                <property name="verticalAlign">top</property>
+            </column>
+            <column>
+                <property name="width">33.4%</property>
+            </column>
+            <row>
+                <cell>
+                    <property name="verticalAlign">top</property>
+                    <image>
+                        <property name="height">0.594in</property>
+                        <property name="width">2.104in</property>
+                        <expression name="uri">http://www.eclipse.org/birt/examples/multichip-4.jpg</expression>
+                    </image>
+                </cell>
+                <cell>
+                    <property name="verticalAlign">top</property>
+                    <text>
+                        <property name="style">Title</property>
+                        <property name="contentType">html</property>
                         <text-property name="content"><![CDATA[<HTML>
 <CENTER>
 <font style="font-size: 18pt; color: #000080">
@@ -141,283 +141,283 @@
 <br>
 For internal use only
 </center>
-</HTML>]]></text-property>

-                    </text>

-                </cell>

-                <cell>

-                    <property name="textAlign">right</property>

-                    <property name="verticalAlign">top</property>

-                    <text>

-                        <property name="style">Title</property>

-                        <property name="contentType">html</property>

+</HTML>]]></text-property>
+                    </text>
+                </cell>
+                <cell>
+                    <property name="textAlign">right</property>
+                    <property name="verticalAlign">top</property>
+                    <text>
+                        <property name="style">Title</property>
+                        <property name="contentType">html</property>
                         <text-property name="content"><![CDATA[<HTML>
 Run on 2/28/05
-</HTML>]]></text-property>

-                    </text>

-                </cell>

-            </row>

-            <row>

-                <property name="height">10pt</property>

-                <cell>

-                    <property name="verticalAlign">top</property>

-                </cell>

-                <cell>

-                    <property name="verticalAlign">top</property>

-                </cell>

-                <cell>

-                    <property name="textAlign">right</property>

-                    <property name="verticalAlign">top</property>

-                </cell>

-            </row>

-        </grid>

-        <table name="table1">

-            <property name="borderBottomColor">#000000</property>

-            <property name="borderBottomStyle">solid</property>

-            <property name="borderBottomWidth">thin</property>

-            <property name="borderLeftColor">#000000</property>

-            <property name="borderLeftStyle">solid</property>

-            <property name="borderLeftWidth">thin</property>

-            <property name="borderRightColor">#000000</property>

-            <property name="borderRightStyle">solid</property>

-            <property name="borderRightWidth">thin</property>

-            <property name="borderTopColor">#000000</property>

-            <property name="borderTopStyle">solid</property>

-            <property name="borderTopWidth">thin</property>

-            <property name="width">100%</property>

-            <property name="dataSet">Customers</property>

-            <list-property name="sort">

-                <structure>

-                    <expression name="key">row["customName"]</expression>

-                    <property name="direction">asc</property>

-                </structure>

-            </list-property>

-            <column>

-                <property name="width">1.594in</property>

-            </column>

-            <column>

-                <property name="width">1.927in</property>

-            </column>

-            <column>

-                <property name="width">2.083in</property>

-            </column>

-            <column>

-                <property name="width">1.26in</property>

-            </column>

-            <header>

-                <row>

-                    <property name="paddingTop">2pt</property>

-                    <property name="paddingLeft">2pt</property>

-                    <property name="paddingBottom">2pt</property>

-                    <cell>

-                        <property name="style">Header</property>

-                        <property name="borderBottomColor">#FFFFFF</property>

-                        <property name="borderBottomStyle">solid</property>

-                        <property name="borderBottomWidth">thin</property>

-                        <property name="borderRightColor">#FFFFFF</property>

-                        <property name="borderRightStyle">solid</property>

-                        <property name="borderRightWidth">thin</property>

-                        <label>

-                            <text-property name="text">State</text-property>

-                        </label>

-                    </cell>

-                    <cell>

-                        <property name="style">Header</property>

-                        <property name="borderBottomColor">#FFFFFF</property>

-                        <property name="borderBottomStyle">solid</property>

-                        <property name="borderBottomWidth">thin</property>

-                        <property name="borderRightColor">#FFFFFF</property>

-                        <property name="borderRightStyle">solid</property>

-                        <property name="borderRightWidth">thin</property>

-                        <label>

-                            <text-property name="text">City</text-property>

-                        </label>

-                    </cell>

-                    <cell>

-                        <property name="style">Header</property>

-                        <property name="borderBottomColor">#FFFFFF</property>

-                        <property name="borderBottomStyle">solid</property>

-                        <property name="borderBottomWidth">thin</property>

-                        <property name="borderRightColor">#FFFFFF</property>

-                        <property name="borderRightStyle">solid</property>

-                        <property name="borderRightWidth">thin</property>

-                        <label>

-                            <text-property name="text">Name</text-property>

-                        </label>

-                    </cell>

-                    <cell>

-                        <property name="style">Header</property>

-                        <property name="borderBottomColor">#FFFFFF</property>

-                        <property name="borderBottomStyle">solid</property>

-                        <property name="borderBottomWidth">thin</property>

-                        <label>

-                            <text-property name="text">Phone</text-property>

-                        </label>

-                    </cell>

-                </row>

-            </header>

-            <group>

-                <property name="groupName">state</property>

-                <property name="interval">none</property>

-                <property name="sortDirection">asc</property>

-                <expression name="keyExpr">row["state"]</expression>

-                <header>

-                    <row>

-                        <cell>

-                            <property name="style">Gray</property>

-                            <property name="borderBottomColor">#FFFFFF</property>

-                            <property name="borderBottomStyle">solid</property>

-                            <property name="borderBottomWidth">thin</property>

-                            <property name="borderRightColor">#FFFFFF</property>

-                            <property name="borderRightStyle">solid</property>

-                            <property name="borderRightWidth">thin</property>

-                            <property name="paddingLeft">4pt</property>

-                            <data>

-                                <property name="fontWeight">bold</property>

-                                <property name="color">#000000</property>

-                                <expression name="valueExpr">row["state"]</expression>

-                            </data>

-                        </cell>

-                        <cell>

-                            <property name="style">Gray</property>

-                            <property name="borderBottomColor">#FFFFFF</property>

-                            <property name="borderBottomStyle">solid</property>

-                            <property name="borderBottomWidth">thin</property>

-                            <property name="borderRightColor">#FFFFFF</property>

-                            <property name="borderRightStyle">solid</property>

-                            <property name="borderRightWidth">thin</property>

-                        </cell>

-                        <cell>

-                            <property name="style">Gray</property>

-                            <property name="borderBottomColor">#FFFFFF</property>

-                            <property name="borderBottomStyle">solid</property>

-                            <property name="borderBottomWidth">thin</property>

-                            <property name="borderRightColor">#FFFFFF</property>

-                            <property name="borderRightStyle">solid</property>

-                            <property name="borderRightWidth">thin</property>

-                        </cell>

-                        <cell>

-                            <property name="style">Gray</property>

-                            <property name="borderBottomColor">#FFFFFF</property>

-                            <property name="borderBottomStyle">solid</property>

-                            <property name="borderBottomWidth">thin</property>

-                        </cell>

-                    </row>

-                </header>

-                <footer>

-                    <row>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                    </row>

-                </footer>

-            </group>

-            <group>

-                <property name="groupName">city</property>

-                <property name="interval">none</property>

-                <property name="sortDirection">asc</property>

-                <expression name="keyExpr">row["city"]</expression>

-                <header>

-                    <row>

-                        <cell>

-                            <property name="style">Lt. Gray</property>

-                            <property name="backgroundColor">#FFFFFF</property>

-                            <property name="borderBottomColor">#FFFFFF</property>

-                            <property name="borderBottomStyle">solid</property>

-                            <property name="borderBottomWidth">thin</property>

-                            <property name="borderRightColor">#FFFFFF</property>

-                            <property name="borderRightStyle">solid</property>

-                            <property name="borderRightWidth">thin</property>

-                        </cell>

-                        <cell>

-                            <property name="style">Lt. Gray</property>

-                            <property name="borderBottomColor">#FFFFFF</property>

-                            <property name="borderBottomStyle">solid</property>

-                            <property name="borderBottomWidth">thin</property>

-                            <property name="borderRightColor">#FFFFFF</property>

-                            <property name="borderRightStyle">solid</property>

-                            <property name="borderRightWidth">thin</property>

-                            <property name="paddingLeft">4pt</property>

-                            <data>

-                                <property name="color">#000000</property>

-                                <expression name="valueExpr">row["city"]</expression>

-                            </data>

-                        </cell>

-                        <cell>

-                            <property name="style">Lt. Gray</property>

-                            <property name="borderBottomColor">#FFFFFF</property>

-                            <property name="borderBottomStyle">solid</property>

-                            <property name="borderBottomWidth">thin</property>

-                            <property name="borderRightColor">#FFFFFF</property>

-                            <property name="borderRightStyle">solid</property>

-                            <property name="borderRightWidth">thin</property>

-                        </cell>

-                        <cell>

-                            <property name="style">Lt. Gray</property>

-                            <property name="borderBottomColor">#FFFFFF</property>

-                            <property name="borderBottomStyle">solid</property>

-                            <property name="borderBottomWidth">thin</property>

-                        </cell>

-                    </row>

-                </header>

-                <footer>

-                    <row>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                    </row>

-                </footer>

-            </group>

-            <detail>

-                <row>

-                    <property name="borderBottomColor">#E6E6E6</property>

-                    <property name="borderBottomStyle">solid</property>

-                    <property name="borderBottomWidth">thin</property>

-                    <cell>

-                        <property name="borderBottomColor">#E6E6E6</property>

-                        <property name="borderBottomStyle">none</property>

-                        <property name="borderBottomWidth">thin</property>

-                    </cell>

-                    <cell>

-                        <property name="borderBottomColor">#E6E6E6</property>

-                        <property name="borderBottomStyle">none</property>

-                        <property name="borderBottomWidth">thin</property>

-                    </cell>

-                    <cell>

-                        <property name="borderBottomColor">#E6E6E6</property>

-                        <property name="borderBottomStyle">solid</property>

-                        <property name="borderBottomWidth">thin</property>

-                        <property name="paddingLeft">4pt</property>

-                        <data>

-                            <expression name="valueExpr">row["customName"]</expression>

-                        </data>

-                    </cell>

-                    <cell>

-                        <property name="borderBottomColor">#E6E6E6</property>

-                        <property name="borderBottomStyle">solid</property>

-                        <property name="borderBottomWidth">thin</property>

-                        <property name="paddingLeft">4pt</property>

-                        <data>

-                            <property name="style">Phone</property>

-                            <expression name="valueExpr">row["phone"]</expression>

-                        </data>

-                    </cell>

-                </row>

-            </detail>

-            <footer>

-                <row>

-                    <cell/>

-                    <cell/>

-                    <cell/>

-                    <cell/>

-                </row>

-            </footer>

-        </table>

-    </body>

-    <list-property name="images">

-        <structure>

-            <property name="name">C:\Paul\Projects\Examples\multichip-4.jpg</property>

+</HTML>]]></text-property>
+                    </text>
+                </cell>
+            </row>
+            <row>
+                <property name="height">10pt</property>
+                <cell>
+                    <property name="verticalAlign">top</property>
+                </cell>
+                <cell>
+                    <property name="verticalAlign">top</property>
+                </cell>
+                <cell>
+                    <property name="textAlign">right</property>
+                    <property name="verticalAlign">top</property>
+                </cell>
+            </row>
+        </grid>
+        <table name="table1">
+            <property name="borderBottomColor">#000000</property>
+            <property name="borderBottomStyle">solid</property>
+            <property name="borderBottomWidth">thin</property>
+            <property name="borderLeftColor">#000000</property>
+            <property name="borderLeftStyle">solid</property>
+            <property name="borderLeftWidth">thin</property>
+            <property name="borderRightColor">#000000</property>
+            <property name="borderRightStyle">solid</property>
+            <property name="borderRightWidth">thin</property>
+            <property name="borderTopColor">#000000</property>
+            <property name="borderTopStyle">solid</property>
+            <property name="borderTopWidth">thin</property>
+            <property name="width">100%</property>
+            <property name="dataSet">Customers</property>
+            <list-property name="sort">
+                <structure>
+                    <expression name="key">row["customName"]</expression>
+                    <property name="direction">asc</property>
+                </structure>
+            </list-property>
+            <column>
+                <property name="width">1.594in</property>
+            </column>
+            <column>
+                <property name="width">1.927in</property>
+            </column>
+            <column>
+                <property name="width">2.083in</property>
+            </column>
+            <column>
+                <property name="width">1.26in</property>
+            </column>
+            <header>
+                <row>
+                    <property name="paddingTop">2pt</property>
+                    <property name="paddingLeft">2pt</property>
+                    <property name="paddingBottom">2pt</property>
+                    <cell>
+                        <property name="style">Header</property>
+                        <property name="borderBottomColor">#FFFFFF</property>
+                        <property name="borderBottomStyle">solid</property>
+                        <property name="borderBottomWidth">thin</property>
+                        <property name="borderRightColor">#FFFFFF</property>
+                        <property name="borderRightStyle">solid</property>
+                        <property name="borderRightWidth">thin</property>
+                        <label>
+                            <text-property name="text">State</text-property>
+                        </label>
+                    </cell>
+                    <cell>
+                        <property name="style">Header</property>
+                        <property name="borderBottomColor">#FFFFFF</property>
+                        <property name="borderBottomStyle">solid</property>
+                        <property name="borderBottomWidth">thin</property>
+                        <property name="borderRightColor">#FFFFFF</property>
+                        <property name="borderRightStyle">solid</property>
+                        <property name="borderRightWidth">thin</property>
+                        <label>
+                            <text-property name="text">City</text-property>
+                        </label>
+                    </cell>
+                    <cell>
+                        <property name="style">Header</property>
+                        <property name="borderBottomColor">#FFFFFF</property>
+                        <property name="borderBottomStyle">solid</property>
+                        <property name="borderBottomWidth">thin</property>
+                        <property name="borderRightColor">#FFFFFF</property>
+                        <property name="borderRightStyle">solid</property>
+                        <property name="borderRightWidth">thin</property>
+                        <label>
+                            <text-property name="text">Name</text-property>
+                        </label>
+                    </cell>
+                    <cell>
+                        <property name="style">Header</property>
+                        <property name="borderBottomColor">#FFFFFF</property>
+                        <property name="borderBottomStyle">solid</property>
+                        <property name="borderBottomWidth">thin</property>
+                        <label>
+                            <text-property name="text">Phone</text-property>
+                        </label>
+                    </cell>
+                </row>
+            </header>
+            <group>
+                <property name="groupName">state</property>
+                <property name="interval">none</property>
+                <property name="sortDirection">asc</property>
+                <expression name="keyExpr">row["state"]</expression>
+                <header>
+                    <row>
+                        <cell>
+                            <property name="style">Gray</property>
+                            <property name="borderBottomColor">#FFFFFF</property>
+                            <property name="borderBottomStyle">solid</property>
+                            <property name="borderBottomWidth">thin</property>
+                            <property name="borderRightColor">#FFFFFF</property>
+                            <property name="borderRightStyle">solid</property>
+                            <property name="borderRightWidth">thin</property>
+                            <property name="paddingLeft">4pt</property>
+                            <data>
+                                <property name="fontWeight">bold</property>
+                                <property name="color">#000000</property>
+                                <expression name="valueExpr">row["state"]</expression>
+                            </data>
+                        </cell>
+                        <cell>
+                            <property name="style">Gray</property>
+                            <property name="borderBottomColor">#FFFFFF</property>
+                            <property name="borderBottomStyle">solid</property>
+                            <property name="borderBottomWidth">thin</property>
+                            <property name="borderRightColor">#FFFFFF</property>
+                            <property name="borderRightStyle">solid</property>
+                            <property name="borderRightWidth">thin</property>
+                        </cell>
+                        <cell>
+                            <property name="style">Gray</property>
+                            <property name="borderBottomColor">#FFFFFF</property>
+                            <property name="borderBottomStyle">solid</property>
+                            <property name="borderBottomWidth">thin</property>
+                            <property name="borderRightColor">#FFFFFF</property>
+                            <property name="borderRightStyle">solid</property>
+                            <property name="borderRightWidth">thin</property>
+                        </cell>
+                        <cell>
+                            <property name="style">Gray</property>
+                            <property name="borderBottomColor">#FFFFFF</property>
+                            <property name="borderBottomStyle">solid</property>
+                            <property name="borderBottomWidth">thin</property>
+                        </cell>
+                    </row>
+                </header>
+                <footer>
+                    <row>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                    </row>
+                </footer>
+            </group>
+            <group>
+                <property name="groupName">city</property>
+                <property name="interval">none</property>
+                <property name="sortDirection">asc</property>
+                <expression name="keyExpr">row["city"]</expression>
+                <header>
+                    <row>
+                        <cell>
+                            <property name="style">Lt. Gray</property>
+                            <property name="backgroundColor">#FFFFFF</property>
+                            <property name="borderBottomColor">#FFFFFF</property>
+                            <property name="borderBottomStyle">solid</property>
+                            <property name="borderBottomWidth">thin</property>
+                            <property name="borderRightColor">#FFFFFF</property>
+                            <property name="borderRightStyle">solid</property>
+                            <property name="borderRightWidth">thin</property>
+                        </cell>
+                        <cell>
+                            <property name="style">Lt. Gray</property>
+                            <property name="borderBottomColor">#FFFFFF</property>
+                            <property name="borderBottomStyle">solid</property>
+                            <property name="borderBottomWidth">thin</property>
+                            <property name="borderRightColor">#FFFFFF</property>
+                            <property name="borderRightStyle">solid</property>
+                            <property name="borderRightWidth">thin</property>
+                            <property name="paddingLeft">4pt</property>
+                            <data>
+                                <property name="color">#000000</property>
+                                <expression name="valueExpr">row["city"]</expression>
+                            </data>
+                        </cell>
+                        <cell>
+                            <property name="style">Lt. Gray</property>
+                            <property name="borderBottomColor">#FFFFFF</property>
+                            <property name="borderBottomStyle">solid</property>
+                            <property name="borderBottomWidth">thin</property>
+                            <property name="borderRightColor">#FFFFFF</property>
+                            <property name="borderRightStyle">solid</property>
+                            <property name="borderRightWidth">thin</property>
+                        </cell>
+                        <cell>
+                            <property name="style">Lt. Gray</property>
+                            <property name="borderBottomColor">#FFFFFF</property>
+                            <property name="borderBottomStyle">solid</property>
+                            <property name="borderBottomWidth">thin</property>
+                        </cell>
+                    </row>
+                </header>
+                <footer>
+                    <row>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                    </row>
+                </footer>
+            </group>
+            <detail>
+                <row>
+                    <property name="borderBottomColor">#E6E6E6</property>
+                    <property name="borderBottomStyle">solid</property>
+                    <property name="borderBottomWidth">thin</property>
+                    <cell>
+                        <property name="borderBottomColor">#E6E6E6</property>
+                        <property name="borderBottomStyle">none</property>
+                        <property name="borderBottomWidth">thin</property>
+                    </cell>
+                    <cell>
+                        <property name="borderBottomColor">#E6E6E6</property>
+                        <property name="borderBottomStyle">none</property>
+                        <property name="borderBottomWidth">thin</property>
+                    </cell>
+                    <cell>
+                        <property name="borderBottomColor">#E6E6E6</property>
+                        <property name="borderBottomStyle">solid</property>
+                        <property name="borderBottomWidth">thin</property>
+                        <property name="paddingLeft">4pt</property>
+                        <data>
+                            <expression name="valueExpr">row["customName"]</expression>
+                        </data>
+                    </cell>
+                    <cell>
+                        <property name="borderBottomColor">#E6E6E6</property>
+                        <property name="borderBottomStyle">solid</property>
+                        <property name="borderBottomWidth">thin</property>
+                        <property name="paddingLeft">4pt</property>
+                        <data>
+                            <property name="style">Phone</property>
+                            <expression name="valueExpr">row["phone"]</expression>
+                        </data>
+                    </cell>
+                </row>
+            </detail>
+            <footer>
+                <row>
+                    <cell/>
+                    <cell/>
+                    <cell/>
+                    <cell/>
+                </row>
+            </footer>
+        </table>
+    </body>
+    <list-property name="images">
+        <structure>
+            <property name="name">C:\Paul\Projects\Examples\multichip-4.jpg</property>
             <property name="data">
                 /9j/4AAQSkZJRgABAgECWAJYAAD/wAARCAA5AMoDASIAAhEBAxEB/9sAhAAFAwMEAwMFBAQEBQUFBgcN
                 CAcHBwcQCwwJDRMQFBMSEBISFRceGRUWHBYSEhojGhwfICEiIRQZJSckICceISEgAQUFBQcGBw8ICA8g
@@ -513,7 +513,7 @@
                 qoWCqCTliSR0r0+igDzjx34N8UWHxCsfiH4Lhsb+9j046XqWl3k5gW7t9/mIY5ACEkVi3UYIYjiqPws8
                 Ea3YfE3xB4vv/COmeFbTUdNtrSOytbmOVnkSSV3lby1C5PmAdzxXqtFAHDfEHwXqPiPx54B1izhhe10P
                 Uri4vC7AFUe2kjXaO/zMtdzRRQAUUUUAf//Z
-            </property>

-        </structure>

-    </list-property>

-</report>

+            </property>
+        </structure>
+    </list-property>
+</report>
diff --git a/examples/solution/index.php b/examples/solution/index.php
new file mode 100644
index 0000000..3c9cf08
--- /dev/null
+++ b/examples/solution/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Created on Feb 26, 2005
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+global $birtPath;
+$birtPath = "../../";
+require $birtPath . "include/viewer.inc";
+viewer( "examples/solution" );
+
+?>
diff --git a/examples/invoice.html b/examples/solution/invoice.html
similarity index 100%
rename from examples/invoice.html
rename to examples/solution/invoice.html
diff --git a/examples/invoice.rptdesign b/examples/solution/invoice.rptdesign
similarity index 99%
rename from examples/invoice.rptdesign
rename to examples/solution/invoice.rptdesign
index 37052f2..30458b7 100644
--- a/examples/invoice.rptdesign
+++ b/examples/solution/invoice.rptdesign
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Written by Eclipse BIRT 0.0 (http://www.eclipse.com) -->

-<report xmlns="http://www.eclipse.com/schemas/BIRT_schema.xsd">

-    <property name="createdBy">Eclipse BIRT Designer Version 0.0.1 Build &lt;20050405-1230></property>

-    <property name="units">in</property>

-    <data-sources>

-        <oda-data-source name="sfdata">

-            <list-property name="userProperties">

-                <structure>

-                    <property name="name">valid</property>

-                    <property name="type">string</property>

-                </structure>

-            </list-property>

-            <property name="valid">true</property>

-            <property name="driverName">jdbc</property>

-            <list-property name="privateDriverProperties">

-                <ex-property>

-                    <name>ODA:url</name>

-                    <value>jdbc:odbc:sfdata</value>

-                </ex-property>

-                <ex-property>

-                    <name>ODA:user</name>

-                </ex-property>

-                <ex-property>

-                    <name>ODA:password</name>

-                </ex-property>

-                <ex-property>

-                    <name>ODA:driver-class</name>

-                    <value>sun.jdbc.odbc.JdbcOdbcDriver</value>

-                </ex-property>

-            </list-property>

-        </oda-data-source>

-    </data-sources>

-    <data-sets>

-        <oda-data-set name="Invoice">

-            <property name="dataSource">sfdata</property>

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Written by Eclipse BIRT 0.0 (http://www.eclipse.com) -->
+<report xmlns="http://www.eclipse.com/schemas/BIRT_schema.xsd">
+    <property name="createdBy">Eclipse BIRT Designer Version 0.0.1 Build &lt;20050405-1230></property>
+    <property name="units">in</property>
+    <data-sources>
+        <oda-data-source name="sfdata">
+            <list-property name="userProperties">
+                <structure>
+                    <property name="name">valid</property>
+                    <property name="type">string</property>
+                </structure>
+            </list-property>
+            <property name="valid">true</property>
+            <property name="driverName">jdbc</property>
+            <list-property name="privateDriverProperties">
+                <ex-property>
+                    <name>ODA:url</name>
+                    <value>jdbc:odbc:sfdata</value>
+                </ex-property>
+                <ex-property>
+                    <name>ODA:user</name>
+                </ex-property>
+                <ex-property>
+                    <name>ODA:password</name>
+                </ex-property>
+                <ex-property>
+                    <name>ODA:driver-class</name>
+                    <value>sun.jdbc.odbc.JdbcOdbcDriver</value>
+                </ex-property>
+            </list-property>
+        </oda-data-source>
+    </data-sources>
+    <data-sets>
+        <oda-data-set name="Invoice">
+            <property name="dataSource">sfdata</property>
             <property name="queryText">SELECT [orders].[orderID],
         [orders].[forecastOrderDate],
         [orders].[shipByDate],
@@ -57,17 +57,17 @@
         [customers].[purchaseVolume],
         [customers].[repID] 
  FROM ([orders] INNER JOIN [customers] ON [orders].[custID] = [customers].[custID] )
- WHERE OrderID = 1150</property>

-            <property name="type">JdbcSelectDataSet</property>

-        </oda-data-set>

-        <oda-data-set name="Line Items">

-            <property name="dataSource">sfdata</property>

-            <list-property name="computedColumns">

-                <structure>

-                    <property name="columnName">extension</property>

-                    <expression name="expression">row["pricequote"]*row["quantity"]</expression>

-                </structure>

-            </list-property>

+ WHERE OrderID = 1150</property>
+            <property name="type">JdbcSelectDataSet</property>
+        </oda-data-set>
+        <oda-data-set name="Line Items">
+            <property name="dataSource">sfdata</property>
+            <list-property name="computedColumns">
+                <structure>
+                    <property name="columnName">extension</property>
+                    <expression name="expression">row["pricequote"]*row["quantity"]</expression>
+                </structure>
+            </list-property>
             <property name="queryText">SELECT [items].[itemcode],
         [items].[description],
         [items].[pricequote],
@@ -75,506 +75,506 @@
         [items].[category],
         [items].[orderID] 
  FROM [items]
- WHERE orderID = 1150</property>

-            <property name="type">JdbcSelectDataSet</property>

-        </oda-data-set>

-    </data-sets>

-    <styles>

-        <style name="Body Grid">

-            <property name="borderBottomStyle">solid</property>

-            <property name="borderBottomWidth">0.5pt</property>

-            <property name="borderLeftStyle">solid</property>

-            <property name="borderLeftWidth">0.5pt</property>

-            <property name="borderRightStyle">solid</property>

-            <property name="borderRightWidth">0.5pt</property>

-            <property name="borderTopStyle">solid</property>

-            <property name="borderTopWidth">0.5pt</property>

-        </style>

-        <style name="Body Grid Header">

-            <property name="backgroundColor">#B3FFFF</property>

-            <property name="fontSize">8pt</property>

-            <property name="fontWeight">bold</property>

-            <property name="textAlign">center</property>

-        </style>

-        <style name="Cell Border">

-            <property name="borderBottomStyle">solid</property>

-            <property name="borderBottomWidth">0.5pt</property>

-            <property name="borderLeftStyle">solid</property>

-            <property name="borderLeftWidth">0.5pt</property>

-            <property name="borderRightStyle">solid</property>

-            <property name="borderRightWidth">0.5pt</property>

-            <property name="borderTopStyle">solid</property>

-            <property name="borderTopWidth">0.5pt</property>

-            <property name="paddingTop">2pt</property>

-            <property name="paddingBottom">2pt</property>

-            <property name="paddingRight">0pt</property>

-            <property name="textAlign">center</property>

-            <property name="verticalAlign">middle</property>

-        </style>

-        <style name="Detail Cell">

-            <property name="borderLeftStyle">solid</property>

-            <property name="borderLeftWidth">0.5pt</property>

-            <property name="borderRightStyle">solid</property>

-            <property name="borderRightWidth">0.5pt</property>

-            <property name="paddingTop">2pt</property>

-            <property name="paddingLeft">4pt</property>

-            <property name="paddingBottom">2pt</property>

-            <property name="paddingRight">4pt</property>

-            <property name="verticalAlign">top</property>

-        </style>

-        <style name="report">

-            <property name="fontFamily">sans-serif</property>

-        </style>

-        <style name="Detail Footer">

-            <property name="borderBottomStyle">solid</property>

-            <property name="borderBottomWidth">0.5pt</property>

-            <property name="borderTopStyle">solid</property>

-            <property name="borderTopWidth">0.5pt</property>

-            <property name="paddingTop">0pt</property>

-            <property name="paddingLeft">0pt</property>

-            <property name="paddingBottom">0pt</property>

-            <property name="paddingRight">0pt</property>

-        </style>

-        <style name="Footer Cell">

-            <property name="borderBottomStyle">solid</property>

-            <property name="borderBottomWidth">0.5pt</property>

-            <property name="borderTopStyle">solid</property>

-            <property name="borderTopWidth">0.5pt</property>

-            <property name="paddingTop">2pt</property>

-            <property name="paddingLeft">4pt</property>

-            <property name="paddingBottom">2pt</property>

-            <property name="paddingRight">4pt</property>

-        </style>

-    </styles>

-    <page-setup>

-        <simple-master-page name="Simple MasterPage">

-            <page-header>

-                <grid>

-                    <property name="width">100%</property>

-                    <column/>

-                    <row>

-                        <cell>

-                            <property name="fontSize">xx-large</property>

-                            <property name="fontWeight">bold</property>

-                            <property name="textAlign">center</property>

-                            <text>

-                                <text-property name="content"><![CDATA[Title]]></text-property>

-                            </text>

-                        </cell>

-                    </row>

-                </grid>

-            </page-header>

-            <page-footer>

-                <grid>

-                    <property name="width">100%</property>

-                    <column/>

-                    <column/>

-                    <row>

-                        <cell>

-                            <text>

-                                <property name="contentType">html</property>

-                                <text-property name="content"><![CDATA[<value-of>new Date()</value-of>]]></text-property>

-                            </text>

-                        </cell>

-                        <cell>

-                            <property name="textAlign">right</property>

-                            <text>

-                                <text-property name="content"><![CDATA[Page:]]></text-property>

-                            </text>

-                        </cell>

-                    </row>

-                </grid>

-            </page-footer>

-        </simple-master-page>

-    </page-setup>

-    <body>

-        <list>

-            <header>

-                <grid>

-                    <property name="width">100%</property>

-                    <column>

-                        <property name="width">1in</property>

-                    </column>

-                    <column>

-                        <property name="width">3in</property>

-                    </column>

-                    <column/>

-                    <column>

-                        <property name="width">2in</property>

-                    </column>

-                    <row>

-                        <cell>

-                            <property name="colSpan">1</property>

-                            <property name="rowSpan">1</property>

-                            <image>

-                                <expression name="uri">http://www.eclipse.org/birt/examples/multichip-6.jpg</expression>

-                            </image>

-                        </cell>

-                        <cell>

-                            <property name="colSpan">1</property>

-                            <property name="rowSpan">1</property>

-                            <text>

-                                <property name="textAlign">center</property>

-                                <property name="contentType">html</property>

+ WHERE orderID = 1150</property>
+            <property name="type">JdbcSelectDataSet</property>
+        </oda-data-set>
+    </data-sets>
+    <styles>
+        <style name="Body Grid">
+            <property name="borderBottomStyle">solid</property>
+            <property name="borderBottomWidth">0.5pt</property>
+            <property name="borderLeftStyle">solid</property>
+            <property name="borderLeftWidth">0.5pt</property>
+            <property name="borderRightStyle">solid</property>
+            <property name="borderRightWidth">0.5pt</property>
+            <property name="borderTopStyle">solid</property>
+            <property name="borderTopWidth">0.5pt</property>
+        </style>
+        <style name="Body Grid Header">
+            <property name="backgroundColor">#B3FFFF</property>
+            <property name="fontSize">8pt</property>
+            <property name="fontWeight">bold</property>
+            <property name="textAlign">center</property>
+        </style>
+        <style name="Cell Border">
+            <property name="borderBottomStyle">solid</property>
+            <property name="borderBottomWidth">0.5pt</property>
+            <property name="borderLeftStyle">solid</property>
+            <property name="borderLeftWidth">0.5pt</property>
+            <property name="borderRightStyle">solid</property>
+            <property name="borderRightWidth">0.5pt</property>
+            <property name="borderTopStyle">solid</property>
+            <property name="borderTopWidth">0.5pt</property>
+            <property name="paddingTop">2pt</property>
+            <property name="paddingBottom">2pt</property>
+            <property name="paddingRight">0pt</property>
+            <property name="textAlign">center</property>
+            <property name="verticalAlign">middle</property>
+        </style>
+        <style name="Detail Cell">
+            <property name="borderLeftStyle">solid</property>
+            <property name="borderLeftWidth">0.5pt</property>
+            <property name="borderRightStyle">solid</property>
+            <property name="borderRightWidth">0.5pt</property>
+            <property name="paddingTop">2pt</property>
+            <property name="paddingLeft">4pt</property>
+            <property name="paddingBottom">2pt</property>
+            <property name="paddingRight">4pt</property>
+            <property name="verticalAlign">top</property>
+        </style>
+        <style name="report">
+            <property name="fontFamily">sans-serif</property>
+        </style>
+        <style name="Detail Footer">
+            <property name="borderBottomStyle">solid</property>
+            <property name="borderBottomWidth">0.5pt</property>
+            <property name="borderTopStyle">solid</property>
+            <property name="borderTopWidth">0.5pt</property>
+            <property name="paddingTop">0pt</property>
+            <property name="paddingLeft">0pt</property>
+            <property name="paddingBottom">0pt</property>
+            <property name="paddingRight">0pt</property>
+        </style>
+        <style name="Footer Cell">
+            <property name="borderBottomStyle">solid</property>
+            <property name="borderBottomWidth">0.5pt</property>
+            <property name="borderTopStyle">solid</property>
+            <property name="borderTopWidth">0.5pt</property>
+            <property name="paddingTop">2pt</property>
+            <property name="paddingLeft">4pt</property>
+            <property name="paddingBottom">2pt</property>
+            <property name="paddingRight">4pt</property>
+        </style>
+    </styles>
+    <page-setup>
+        <simple-master-page name="Simple MasterPage">
+            <page-header>
+                <grid>
+                    <property name="width">100%</property>
+                    <column/>
+                    <row>
+                        <cell>
+                            <property name="fontSize">xx-large</property>
+                            <property name="fontWeight">bold</property>
+                            <property name="textAlign">center</property>
+                            <text>
+                                <text-property name="content"><![CDATA[Title]]></text-property>
+                            </text>
+                        </cell>
+                    </row>
+                </grid>
+            </page-header>
+            <page-footer>
+                <grid>
+                    <property name="width">100%</property>
+                    <column/>
+                    <column/>
+                    <row>
+                        <cell>
+                            <text>
+                                <property name="contentType">html</property>
+                                <text-property name="content"><![CDATA[<value-of>new Date()</value-of>]]></text-property>
+                            </text>
+                        </cell>
+                        <cell>
+                            <property name="textAlign">right</property>
+                            <text>
+                                <text-property name="content"><![CDATA[Page:]]></text-property>
+                            </text>
+                        </cell>
+                    </row>
+                </grid>
+            </page-footer>
+        </simple-master-page>
+    </page-setup>
+    <body>
+        <list>
+            <header>
+                <grid>
+                    <property name="width">100%</property>
+                    <column>
+                        <property name="width">1in</property>
+                    </column>
+                    <column>
+                        <property name="width">3in</property>
+                    </column>
+                    <column/>
+                    <column>
+                        <property name="width">2in</property>
+                    </column>
+                    <row>
+                        <cell>
+                            <property name="colSpan">1</property>
+                            <property name="rowSpan">1</property>
+                            <image>
+                                <expression name="uri">http://www.eclipse.org/birt/examples/multichip-6.jpg</expression>
+                            </image>
+                        </cell>
+                        <cell>
+                            <property name="colSpan">1</property>
+                            <property name="rowSpan">1</property>
+                            <text>
+                                <property name="textAlign">center</property>
+                                <property name="contentType">html</property>
                                 <text-property name="content"><![CDATA[<FONT size="24"><b>MultiChip Technology Corp.</FONT><br>
 1234 Technology Circle<br>
 Vacas Grandes, CA 99887<br>
 <br>
-(555) 123-4567]]></text-property>

-                            </text>

-                        </cell>

-                        <cell/>

-                        <cell>

-                            <property name="drop">none</property>

-                            <property name="height">0.25in</property>

-                            <property name="textAlign">left</property>

-                            <property name="verticalAlign">top</property>

-                            <property name="canShrink">false</property>

-                            <grid>

-                                <property name="width">100%</property>

-                                <property name="dataSet">Invoice</property>

-                                <column>

-                                    <property name="width">0.947in</property>

-                                </column>

-                                <column>

-                                    <property name="width">1.041in</property>

-                                </column>

-                                <row>

-                                    <cell>

-                                        <property name="colSpan">2</property>

-                                        <property name="rowSpan">1</property>

-                                        <label>

-                                            <property name="backgroundColor">#0080FF</property>

-                                            <property name="fontSize">14pt</property>

-                                            <property name="fontWeight">900</property>

-                                            <property name="color">#FFFFFF</property>

-                                            <property name="marginBottom">4pt</property>

-                                            <property name="paddingTop">2pt</property>

-                                            <property name="paddingBottom">2pt</property>

-                                            <property name="textAlign">center</property>

-                                            <text-property name="text">Invoice</text-property>

-                                        </label>

-                                    </cell>

-                                </row>

-                                <row>

-                                    <cell>

-                                        <label>

-                                            <property name="fontSize">7pt</property>

-                                            <text-property name="text">DATE</text-property>

-                                        </label>

-                                    </cell>

-                                    <cell>

-                                        <label>

-                                            <property name="fontSize">7pt</property>

-                                            <property name="textAlign">right</property>

-                                            <text-property name="text">INVOICE NO.</text-property>

-                                        </label>

-                                    </cell>

-                                </row>

-                                <row>

-                                    <cell>

-                                        <data>

-                                            <property name="fontWeight">bold</property>

-                                            <property name="dateTimeFormat">Short Date</property>

-                                            <expression name="valueExpr">row["forecastOrderDate"]</expression>

-                                        </data>

-                                    </cell>

-                                    <cell>

-                                        <data>

-                                            <property name="fontWeight">bold</property>

-                                            <property name="numberFormat">#####</property>

-                                            <property name="textAlign">right</property>

-                                            <expression name="valueExpr">row["orderID"]</expression>

-                                        </data>

-                                    </cell>

-                                </row>

-                            </grid>

-                        </cell>

-                    </row>

-                </grid>

-                <grid>

-                    <property name="marginLeft">0.25in</property>

-                    <property name="canShrink">false</property>

-                    <property name="height">2in</property>

-                    <property name="width">100%</property>

-                    <property name="dataSet">Invoice</property>

-                    <column>

-                        <property name="width">0.718in</property>

-                    </column>

-                    <column>

-                        <property name="width">2.427in</property>

-                    </column>

-                    <column>

-                        <property name="width">0.739in</property>

-                    </column>

-                    <column>

-                        <property name="width">2.406in</property>

-                    </column>

-                    <row>

-                        <property name="height">0.5in</property>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                    </row>

-                    <row>

-                        <cell>

-                            <label>

-                                <property name="fontSize">7pt</property>

-                                <text-property name="text">BILL TO:</text-property>

-                            </label>

-                        </cell>

-                        <cell>

-                            <data>

-                                <expression name="valueExpr">row["customName"]</expression>

-                            </data>

-                        </cell>

-                        <cell>

-                            <label>

-                                <property name="fontSize">7pt</property>

-                                <text-property name="text">SHIP TO:</text-property>

-                            </label>

-                        </cell>

-                        <cell>

-                            <label>

-                                <text-property name="text">Same</text-property>

-                            </label>

-                        </cell>

-                    </row>

-                    <row>

-                        <cell/>

-                        <cell>

-                            <data>

-                                <expression name="valueExpr">row["address"]</expression>

-                            </data>

-                        </cell>

-                        <cell/>

-                        <cell/>

-                    </row>

-                    <row>

-                        <cell/>

-                        <cell>

-                            <text>

-                                <property name="contentType">html</property>

+(555) 123-4567]]></text-property>
+                            </text>
+                        </cell>
+                        <cell/>
+                        <cell>
+                            <property name="drop">none</property>
+                            <property name="height">0.25in</property>
+                            <property name="textAlign">left</property>
+                            <property name="verticalAlign">top</property>
+                            <property name="canShrink">false</property>
+                            <grid>
+                                <property name="width">100%</property>
+                                <property name="dataSet">Invoice</property>
+                                <column>
+                                    <property name="width">0.947in</property>
+                                </column>
+                                <column>
+                                    <property name="width">1.041in</property>
+                                </column>
+                                <row>
+                                    <cell>
+                                        <property name="colSpan">2</property>
+                                        <property name="rowSpan">1</property>
+                                        <label>
+                                            <property name="backgroundColor">#0080FF</property>
+                                            <property name="fontSize">14pt</property>
+                                            <property name="fontWeight">900</property>
+                                            <property name="color">#FFFFFF</property>
+                                            <property name="marginBottom">4pt</property>
+                                            <property name="paddingTop">2pt</property>
+                                            <property name="paddingBottom">2pt</property>
+                                            <property name="textAlign">center</property>
+                                            <text-property name="text">Invoice</text-property>
+                                        </label>
+                                    </cell>
+                                </row>
+                                <row>
+                                    <cell>
+                                        <label>
+                                            <property name="fontSize">7pt</property>
+                                            <text-property name="text">DATE</text-property>
+                                        </label>
+                                    </cell>
+                                    <cell>
+                                        <label>
+                                            <property name="fontSize">7pt</property>
+                                            <property name="textAlign">right</property>
+                                            <text-property name="text">INVOICE NO.</text-property>
+                                        </label>
+                                    </cell>
+                                </row>
+                                <row>
+                                    <cell>
+                                        <data>
+                                            <property name="fontWeight">bold</property>
+                                            <property name="dateTimeFormat">Short Date</property>
+                                            <expression name="valueExpr">row["forecastOrderDate"]</expression>
+                                        </data>
+                                    </cell>
+                                    <cell>
+                                        <data>
+                                            <property name="fontWeight">bold</property>
+                                            <property name="numberFormat">#####</property>
+                                            <property name="textAlign">right</property>
+                                            <expression name="valueExpr">row["orderID"]</expression>
+                                        </data>
+                                    </cell>
+                                </row>
+                            </grid>
+                        </cell>
+                    </row>
+                </grid>
+                <grid>
+                    <property name="marginLeft">0.25in</property>
+                    <property name="canShrink">false</property>
+                    <property name="height">2in</property>
+                    <property name="width">100%</property>
+                    <property name="dataSet">Invoice</property>
+                    <column>
+                        <property name="width">0.718in</property>
+                    </column>
+                    <column>
+                        <property name="width">2.427in</property>
+                    </column>
+                    <column>
+                        <property name="width">0.739in</property>
+                    </column>
+                    <column>
+                        <property name="width">2.406in</property>
+                    </column>
+                    <row>
+                        <property name="height">0.5in</property>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                    </row>
+                    <row>
+                        <cell>
+                            <label>
+                                <property name="fontSize">7pt</property>
+                                <text-property name="text">BILL TO:</text-property>
+                            </label>
+                        </cell>
+                        <cell>
+                            <data>
+                                <expression name="valueExpr">row["customName"]</expression>
+                            </data>
+                        </cell>
+                        <cell>
+                            <label>
+                                <property name="fontSize">7pt</property>
+                                <text-property name="text">SHIP TO:</text-property>
+                            </label>
+                        </cell>
+                        <cell>
+                            <label>
+                                <text-property name="text">Same</text-property>
+                            </label>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell/>
+                        <cell>
+                            <data>
+                                <expression name="valueExpr">row["address"]</expression>
+                            </data>
+                        </cell>
+                        <cell/>
+                        <cell/>
+                    </row>
+                    <row>
+                        <cell/>
+                        <cell>
+                            <text>
+                                <property name="contentType">html</property>
                                 <text-property name="content"><![CDATA[<VALUE-OF>row["city"]</VALUE-OF>,
 <VALUE-OF>row["state"]</VALUE-OF>
-<VALUE-OF>row["postalcode"]</VALUE-OF>]]></text-property>

-                            </text>

-                        </cell>

-                        <cell/>

-                        <cell/>

-                    </row>

-                    <row>

-                        <property name="height">0.5in</property>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                        <cell/>

-                    </row>

-                </grid>

-                <grid>

-                    <property name="style">Body Grid</property>

-                    <property name="width">100%</property>

-                    <property name="dataSet">Invoice</property>

-                    <column/>

-                    <column/>

-                    <column/>

-                    <column/>

-                    <column/>

-                    <column/>

-                    <row>

-                        <property name="style">Body Grid Header</property>

-                        <cell>

-                            <property name="style">Cell Border</property>

-                            <label>

-                                <text-property name="text">P.O. NUMBER</text-property>

-                            </label>

-                        </cell>

-                        <cell>

-                            <property name="style">Cell Border</property>

-                            <label>

-                                <text-property name="text">TERMS</text-property>

-                            </label>

-                        </cell>

-                        <cell>

-                            <property name="style">Cell Border</property>

-                            <label>

-                                <text-property name="text">REP</text-property>

-                            </label>

-                        </cell>

-                        <cell>

-                            <property name="style">Cell Border</property>

-                            <label>

-                                <text-property name="text">SHIP</text-property>

-                            </label>

-                        </cell>

-                        <cell>

-                            <property name="style">Cell Border</property>

-                            <label>

-                                <text-property name="text">VIA</text-property>

-                            </label>

-                        </cell>

-                        <cell>

-                            <property name="style">Cell Border</property>

-                            <label>

-                                <text-property name="text">F.O.B.</text-property>

-                            </label>

-                        </cell>

-                    </row>

-                    <row>

-                        <cell>

-                            <property name="style">Cell Border</property>

-                        </cell>

-                        <cell>

-                            <property name="style">Cell Border</property>

-                            <label>

-                                <text-property name="text">NET30</text-property>

-                            </label>

-                        </cell>

-                        <cell>

-                            <property name="style">Cell Border</property>

-                            <data>

-                                <property name="numberFormat">#####</property>

-                                <expression name="valueExpr">row["repID"]</expression>

-                            </data>

-                        </cell>

-                        <cell>

-                            <property name="style">Cell Border</property>

-                            <data>

-                                <property name="dateTimeFormat">Short Date</property>

-                                <expression name="valueExpr">row["forecastShipDate"]</expression>

-                            </data>

-                        </cell>

-                        <cell>

-                            <property name="style">Cell Border</property>

-                        </cell>

-                        <cell>

-                            <property name="style">Cell Border</property>

-                        </cell>

-                    </row>

-                </grid>

-                <table>

-                    <property name="style">Body Grid</property>

-                    <property name="width">100%</property>

-                    <property name="dataSet">Line Items</property>

-                    <column>

-                        <property name="width">0.75in</property>

-                    </column>

-                    <column>

-                        <property name="width">1in</property>

-                    </column>

-                    <column/>

-                    <column>

-                        <property name="width">0.75in</property>

-                    </column>

-                    <column>

-                        <property name="width">1in</property>

-                    </column>

-                    <header>

-                        <row>

-                            <property name="style">Body Grid Header</property>

-                            <cell>

-                                <property name="style">Cell Border</property>

-                                <label>

-                                    <text-property name="text">QUANTITY</text-property>

-                                </label>

-                            </cell>

-                            <cell>

-                                <property name="style">Cell Border</property>

-                                <label>

-                                    <text-property name="text">ITEM CODE</text-property>

-                                </label>

-                            </cell>

-                            <cell>

-                                <property name="style">Cell Border</property>

-                                <label>

-                                    <text-property name="text">DESCRIPTION</text-property>

-                                </label>

-                            </cell>

-                            <cell>

-                                <property name="style">Cell Border</property>

-                                <label>

-                                    <text-property name="text">PRICE EACH</text-property>

-                                </label>

-                            </cell>

-                            <cell>

-                                <property name="style">Cell Border</property>

-                                <label>

-                                    <text-property name="text">AMOUNT</text-property>

-                                </label>

-                            </cell>

-                        </row>

-                    </header>

-                    <detail>

-                        <row>

-                            <cell>

-                                <property name="style">Detail Cell</property>

-                                <data>

-                                    <property name="textAlign">right</property>

-                                    <expression name="valueExpr">row["quantity"]</expression>

-                                </data>

-                            </cell>

-                            <cell>

-                                <property name="style">Detail Cell</property>

-                                <data>

-                                    <expression name="valueExpr">row["itemcode"]</expression>

-                                </data>

-                            </cell>

-                            <cell>

-                                <property name="style">Detail Cell</property>

-                                <data>

-                                    <expression name="valueExpr">row["description"]</expression>

-                                </data>

-                            </cell>

-                            <cell>

-                                <property name="style">Detail Cell</property>

-                                <data>

-                                    <property name="numberFormat">#,###.00</property>

-                                    <property name="textAlign">right</property>

-                                    <expression name="valueExpr">row["pricequote"]</expression>

-                                </data>

-                            </cell>

-                            <cell>

-                                <property name="style">Detail Cell</property>

-                                <data>

-                                    <property name="numberFormat">##,###.00</property>

-                                    <property name="textAlign">right</property>

-                                    <expression name="valueExpr">row["extension"]</expression>

-                                </data>

-                            </cell>

-                        </row>

-                    </detail>

-                    <footer>

-                        <row>

-                            <property name="fontWeight">bold</property>

-                            <cell>

-                                <property name="style">Footer Cell</property>

-                            </cell>

-                            <cell>

-                                <property name="style">Footer Cell</property>

-                            </cell>

-                            <cell>

-                                <property name="style">Footer Cell</property>

-                            </cell>

-                            <cell>

-                                <property name="style">Cell Border</property>

-                                <label>

-                                    <property name="textAlign">center</property>

-                                    <text-property name="text">TOTAL</text-property>

-                                </label>

-                            </cell>

-                            <cell>

-                                <property name="style">Footer Cell</property>

-                                <data>

-                                    <property name="numberFormat">$##,###.00</property>

-                                    <property name="textAlign">right</property>

-                                    <expression name="valueExpr">Total.sum( row.extension )</expression>

-                                </data>

-                            </cell>

-                        </row>

-                    </footer>

-                </table>

-            </header>

-        </list>

-    </body>

-</report>

+<VALUE-OF>row["postalcode"]</VALUE-OF>]]></text-property>
+                            </text>
+                        </cell>
+                        <cell/>
+                        <cell/>
+                    </row>
+                    <row>
+                        <property name="height">0.5in</property>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                        <cell/>
+                    </row>
+                </grid>
+                <grid>
+                    <property name="style">Body Grid</property>
+                    <property name="width">100%</property>
+                    <property name="dataSet">Invoice</property>
+                    <column/>
+                    <column/>
+                    <column/>
+                    <column/>
+                    <column/>
+                    <column/>
+                    <row>
+                        <property name="style">Body Grid Header</property>
+                        <cell>
+                            <property name="style">Cell Border</property>
+                            <label>
+                                <text-property name="text">P.O. NUMBER</text-property>
+                            </label>
+                        </cell>
+                        <cell>
+                            <property name="style">Cell Border</property>
+                            <label>
+                                <text-property name="text">TERMS</text-property>
+                            </label>
+                        </cell>
+                        <cell>
+                            <property name="style">Cell Border</property>
+                            <label>
+                                <text-property name="text">REP</text-property>
+                            </label>
+                        </cell>
+                        <cell>
+                            <property name="style">Cell Border</property>
+                            <label>
+                                <text-property name="text">SHIP</text-property>
+                            </label>
+                        </cell>
+                        <cell>
+                            <property name="style">Cell Border</property>
+                            <label>
+                                <text-property name="text">VIA</text-property>
+                            </label>
+                        </cell>
+                        <cell>
+                            <property name="style">Cell Border</property>
+                            <label>
+                                <text-property name="text">F.O.B.</text-property>
+                            </label>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell>
+                            <property name="style">Cell Border</property>
+                        </cell>
+                        <cell>
+                            <property name="style">Cell Border</property>
+                            <label>
+                                <text-property name="text">NET30</text-property>
+                            </label>
+                        </cell>
+                        <cell>
+                            <property name="style">Cell Border</property>
+                            <data>
+                                <property name="numberFormat">#####</property>
+                                <expression name="valueExpr">row["repID"]</expression>
+                            </data>
+                        </cell>
+                        <cell>
+                            <property name="style">Cell Border</property>
+                            <data>
+                                <property name="dateTimeFormat">Short Date</property>
+                                <expression name="valueExpr">row["forecastShipDate"]</expression>
+                            </data>
+                        </cell>
+                        <cell>
+                            <property name="style">Cell Border</property>
+                        </cell>
+                        <cell>
+                            <property name="style">Cell Border</property>
+                        </cell>
+                    </row>
+                </grid>
+                <table>
+                    <property name="style">Body Grid</property>
+                    <property name="width">100%</property>
+                    <property name="dataSet">Line Items</property>
+                    <column>
+                        <property name="width">0.75in</property>
+                    </column>
+                    <column>
+                        <property name="width">1in</property>
+                    </column>
+                    <column/>
+                    <column>
+                        <property name="width">0.75in</property>
+                    </column>
+                    <column>
+                        <property name="width">1in</property>
+                    </column>
+                    <header>
+                        <row>
+                            <property name="style">Body Grid Header</property>
+                            <cell>
+                                <property name="style">Cell Border</property>
+                                <label>
+                                    <text-property name="text">QUANTITY</text-property>
+                                </label>
+                            </cell>
+                            <cell>
+                                <property name="style">Cell Border</property>
+                                <label>
+                                    <text-property name="text">ITEM CODE</text-property>
+                                </label>
+                            </cell>
+                            <cell>
+                                <property name="style">Cell Border</property>
+                                <label>
+                                    <text-property name="text">DESCRIPTION</text-property>
+                                </label>
+                            </cell>
+                            <cell>
+                                <property name="style">Cell Border</property>
+                                <label>
+                                    <text-property name="text">PRICE EACH</text-property>
+                                </label>
+                            </cell>
+                            <cell>
+                                <property name="style">Cell Border</property>
+                                <label>
+                                    <text-property name="text">AMOUNT</text-property>
+                                </label>
+                            </cell>
+                        </row>
+                    </header>
+                    <detail>
+                        <row>
+                            <cell>
+                                <property name="style">Detail Cell</property>
+                                <data>
+                                    <property name="textAlign">right</property>
+                                    <expression name="valueExpr">row["quantity"]</expression>
+                                </data>
+                            </cell>
+                            <cell>
+                                <property name="style">Detail Cell</property>
+                                <data>
+                                    <expression name="valueExpr">row["itemcode"]</expression>
+                                </data>
+                            </cell>
+                            <cell>
+                                <property name="style">Detail Cell</property>
+                                <data>
+                                    <expression name="valueExpr">row["description"]</expression>
+                                </data>
+                            </cell>
+                            <cell>
+                                <property name="style">Detail Cell</property>
+                                <data>
+                                    <property name="numberFormat">#,###.00</property>
+                                    <property name="textAlign">right</property>
+                                    <expression name="valueExpr">row["pricequote"]</expression>
+                                </data>
+                            </cell>
+                            <cell>
+                                <property name="style">Detail Cell</property>
+                                <data>
+                                    <property name="numberFormat">##,###.00</property>
+                                    <property name="textAlign">right</property>
+                                    <expression name="valueExpr">row["extension"]</expression>
+                                </data>
+                            </cell>
+                        </row>
+                    </detail>
+                    <footer>
+                        <row>
+                            <property name="fontWeight">bold</property>
+                            <cell>
+                                <property name="style">Footer Cell</property>
+                            </cell>
+                            <cell>
+                                <property name="style">Footer Cell</property>
+                            </cell>
+                            <cell>
+                                <property name="style">Footer Cell</property>
+                            </cell>
+                            <cell>
+                                <property name="style">Cell Border</property>
+                                <label>
+                                    <property name="textAlign">center</property>
+                                    <text-property name="text">TOTAL</text-property>
+                                </label>
+                            </cell>
+                            <cell>
+                                <property name="style">Footer Cell</property>
+                                <data>
+                                    <property name="numberFormat">$##,###.00</property>
+                                    <property name="textAlign">right</property>
+                                    <expression name="valueExpr">Total.sum( row.extension )</expression>
+                                </data>
+                            </cell>
+                        </row>
+                    </footer>
+                </table>
+            </header>
+        </list>
+    </body>
+</report>
diff --git a/examples/solution/main.html b/examples/solution/main.html
new file mode 100644
index 0000000..af12229
--- /dev/null
+++ b/examples/solution/main.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>BIRT Example Reports</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Example Reports</p>
+<p class="subhead">A Taste of what you can do with BIRT</p>
+
+<h1>Introduction</h1>
+
+<p>The example reports here show just a few of the things you can do with BIRT.
+  Unless otherwise noted, the reports are meant to be run against the &quot;Classic Models Inc.&quot; sample database that is included in the BIRT download. </p>
+<p>Preview a report by clicking on the title  link. To try a report for yourself, click on the rptdesign link to display the ROM file, save it to disk and then use File--&gt;Import to bring the file into your Eclipse workspace. If the report uses the Classic Models database, you should be able to run the report immediately. If the report uses another database, follow the instructions provided in the &quot;Other Notes&quot; section of its description. </p>
+
+<h1> Listing</h1>
+
+<dl class="bold-list">
+<dt><a href="ProductCatalog.html" target="_blank" class="top">Product Catalog</a>
+(<a href="ProductCatalog.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Prints the Classic Models product catalog, grouped by product category. 
+Provides product name, cost and description. Demonstrates one level grouping and using a grid within a table row to structure spacing. 
+Also shows image inclusion and use of the <em>&lt;value-of&gt;</em> tag in text item to include 
+the content of a database column. Finally, the report makes  use of styles to simplify maintenance 
+and achieve a consistent look.
+</dd>
+
+<dt><a href="TopSellingProducts.html" target="_blank" class="top">Top Selling Products</a>
+(<a href="TopSellingProducts.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Displays a pie chart showing revenue by product line. Lists the top selling products, sorted by revenue.  Demonstrates use of a chart and sorting a result set.  
+Also shows image inclusion and use of grid and tables to organize report content. Finally, the report makes  use of styles to simplify maintenance 
+and achieve a consistent look.
+</dd>
+</dl>
+
+<h1>Business Forms</h1>
+
+<dl class="bold-list">
+
+<dt><a href="SalesInvoice.html" target="_blank" class="top">Sales Invoice</a>
+(<a href="SalesInvoice.rptdesign" target="_blank">rptdesign</a>)</dt>
+<dd>Prints an invoice for the selected order, including customer and invoice details and products ordered.   Demonstrates use of a parameter to select the order to invoice and expressions for several calculated fields, including discount and order total. Uses expression to build customer address string and illustrates suppression of nulls in database fields with javascript function <em>replace</em>.   
+Also shows image inclusion and sophisticated use of grids and tables to organize report content. Finally, the report makes  use of styles to simplify maintenance 
+and achieve a consistent look.
+</dd>
+
+</dl>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/solution/menu.txt b/examples/solution/menu.txt
new file mode 100644
index 0000000..b56da76
--- /dev/null
+++ b/examples/solution/menu.txt
@@ -0,0 +1,8 @@
+<birt-menu>
+<top name="examples" page="../../examples"/>
+<item-gone name="grouped list" url="grouped_table.html"/>
+<item-gone name="drop list" url="drop_group_mockup.html"/>
+<item-gone name="side-by-side" url="parallel.html"/>
+<item-gone name="invoice" url="invoice.html"/>
+<item-gone name="bank statement" url="AccountDetails.html"/>
+</birt-menu>
\ No newline at end of file
diff --git a/examples/multichip-4.jpg b/examples/solution/multichip-4.jpg
similarity index 100%
rename from examples/multichip-4.jpg
rename to examples/solution/multichip-4.jpg
Binary files differ
diff --git a/examples/multichip-5.jpg b/examples/solution/multichip-5.jpg
similarity index 100%
rename from examples/multichip-5.jpg
rename to examples/solution/multichip-5.jpg
Binary files differ
diff --git a/examples/multichip-6.jpg b/examples/solution/multichip-6.jpg
similarity index 100%
rename from examples/multichip-6.jpg
rename to examples/solution/multichip-6.jpg
Binary files differ
diff --git a/examples/parallel-notes.html b/examples/solution/parallel-notes.html
similarity index 100%
rename from examples/parallel-notes.html
rename to examples/solution/parallel-notes.html
diff --git a/examples/parallel.html b/examples/solution/parallel.html
similarity index 100%
rename from examples/parallel.html
rename to examples/solution/parallel.html
diff --git a/examples/parallel.rptdesign b/examples/solution/parallel.rptdesign
similarity index 99%
rename from examples/parallel.rptdesign
rename to examples/solution/parallel.rptdesign
index ee3519d..9088d55 100644
--- a/examples/parallel.rptdesign
+++ b/examples/solution/parallel.rptdesign
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Written by Eclipse BIRT 0.0 (http://www.eclipse.com) -->

-<report xmlns="http://www.eclipse.com/schemas/BIRT_schema.xsd">

-    <property name="createdBy">Eclipse BIRT Designer Version 0.0.1 Build &lt;20050405-1230></property>

-    <property name="units">in</property>

-    <data-sources>

-        <oda-data-source name="Employees">

-            <list-property name="userProperties">

-                <structure>

-                    <property name="name">valid</property>

-                    <property name="type">string</property>

-                </structure>

-            </list-property>

-            <property name="valid">true</property>

-            <property name="driverName">jdbc</property>

-            <list-property name="privateDriverProperties">

-                <ex-property>

-                    <name>ODA:url</name>

-                    <value>jdbc:odbc:EmpExample</value>

-                </ex-property>

-                <ex-property>

-                    <name>ODA:user</name>

-                </ex-property>

-                <ex-property>

-                    <name>ODA:password</name>

-                </ex-property>

-                <ex-property>

-                    <name>ODA:driver-class</name>

-                    <value>sun.jdbc.odbc.JdbcOdbcDriver</value>

-                </ex-property>

-            </list-property>

-        </oda-data-source>

-    </data-sources>

-    <data-sets>

-        <oda-data-set name="Employees">

-            <property name="dataSource">Employees</property>

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Written by Eclipse BIRT 0.0 (http://www.eclipse.com) -->
+<report xmlns="http://www.eclipse.com/schemas/BIRT_schema.xsd">
+    <property name="createdBy">Eclipse BIRT Designer Version 0.0.1 Build &lt;20050405-1230></property>
+    <property name="units">in</property>
+    <data-sources>
+        <oda-data-source name="Employees">
+            <list-property name="userProperties">
+                <structure>
+                    <property name="name">valid</property>
+                    <property name="type">string</property>
+                </structure>
+            </list-property>
+            <property name="valid">true</property>
+            <property name="driverName">jdbc</property>
+            <list-property name="privateDriverProperties">
+                <ex-property>
+                    <name>ODA:url</name>
+                    <value>jdbc:odbc:EmpExample</value>
+                </ex-property>
+                <ex-property>
+                    <name>ODA:user</name>
+                </ex-property>
+                <ex-property>
+                    <name>ODA:password</name>
+                </ex-property>
+                <ex-property>
+                    <name>ODA:driver-class</name>
+                    <value>sun.jdbc.odbc.JdbcOdbcDriver</value>
+                </ex-property>
+            </list-property>
+        </oda-data-source>
+    </data-sources>
+    <data-sets>
+        <oda-data-set name="Employees">
+            <property name="dataSource">Employees</property>
             <property name="queryText">SELECT Employees.EmployeeID,
         Employees.SocialSecurityNumber,
         Employees.FirstName,
@@ -49,451 +49,451 @@
         Employees.WorkPhone,
         Employees.DateHired 
  FROM Employees
- WHERE EmployeeID = 2</property>

-            <property name="type">JdbcSelectDataSet</property>

-        </oda-data-set>

-        <oda-data-set name="Job History">

-            <property name="dataSource">Employees</property>

+ WHERE EmployeeID = 2</property>
+            <property name="type">JdbcSelectDataSet</property>
+        </oda-data-set>
+        <oda-data-set name="Job History">
+            <property name="dataSource">Employees</property>
             <property name="queryText">SELECT JobHistory.EmployeeID,
         JobHistory.JobTitle,
         JobHistory.JobTitleEffectiveDate 
  FROM JobHistory
- WHERE EmployeeID = 2</property>

-            <property name="type">JdbcSelectDataSet</property>

-        </oda-data-set>

-        <oda-data-set name="Salary History">

-            <property name="dataSource">Employees</property>

+ WHERE EmployeeID = 2</property>
+            <property name="type">JdbcSelectDataSet</property>
+        </oda-data-set>
+        <oda-data-set name="Salary History">
+            <property name="dataSource">Employees</property>
             <property name="queryText">SELECT SalaryHistory.EmployeeID,
         SalaryHistory.Salary,
         SalaryHistory.SalaryEffectiveDate 
  FROM SalaryHistory
- WHERE EmployeeID = 2</property>

-            <property name="type">JdbcSelectDataSet</property>

-        </oda-data-set>

-    </data-sets>

-    <styles>

-        <style name="Phone">

-            <property name="stringFormat">(@@@) @@@-@@@@</property>

-            <property name="showIfBlank">false</property>

-            <property name="canShrink">true</property>

-        </style>

-        <style name="My Date">

-            <property name="dateTimeFormat">Short Date</property>

-            <property name="showIfBlank">false</property>

-            <property name="canShrink">true</property>

-        </style>

-        <style name="Ident">

-            <property name="fontFamily">sans-serif</property>

-            <property name="fontSize">x-small</property>

-            <property name="fontWeight">bold</property>

-            <property name="fontStyle">normal</property>

-            <property name="color">#000000</property>

-            <property name="textLineThrough">none</property>

-            <property name="textOverline">none</property>

-            <property name="textUnderline">none</property>

-            <property name="showIfBlank">false</property>

-            <property name="canShrink">true</property>

-        </style>

-        <style name="Currency">

-            <property name="numberFormat">$##,###.##</property>

-            <property name="showIfBlank">false</property>

-            <property name="canShrink">true</property>

-        </style>

-        <style name="report">

-            <property name="fontFamily">sans-serif</property>

-        </style>

-    </styles>

-    <page-setup>

-        <simple-master-page name="Simple MasterPage">

-            <page-header>

-                <grid>

-                    <property name="width">100%</property>

-                    <column/>

-                    <row>

-                        <cell>

-                            <property name="fontSize">xx-large</property>

-                            <property name="fontWeight">bold</property>

-                            <property name="textAlign">center</property>

-                            <text>

-                                <text-property name="content"><![CDATA[Title]]></text-property>

-                            </text>

-                        </cell>

-                    </row>

-                </grid>

-            </page-header>

-            <page-footer>

-                <grid>

-                    <row>

-                        <cell>

-                            <text>

-                                <property name="contentType">html</property>

-                                <text-property name="content"><![CDATA[<value-of>new Date()</value-of>]]></text-property>

-                            </text>

-                        </cell>

-                        <cell>

-                            <property name="textAlign">right</property>

-                            <text>

-                                <text-property name="content"><![CDATA[Page:]]></text-property>

-                            </text>

-                        </cell>

-                    </row>

-                </grid>

-            </page-footer>

-        </simple-master-page>

-    </page-setup>

-    <body>

-        <grid>

-            <property name="width">100%</property>

-            <column>

-                <property name="width">25%</property>

-            </column>

-            <column>

-                <property name="width">50%</property>

-                <property name="textAlign">center</property>

-                <property name="verticalAlign">top</property>

-            </column>

-            <column>

-                <property name="width">25%</property>

-            </column>

-            <row>

-                <cell>

-                    <property name="verticalAlign">top</property>

-                    <image>

-                        <property name="height">0.594in</property>

-                        <property name="width">2.104in</property>

-                        <expression name="uri">http://www.eclipse.org/birt/examples/multichip-4.jpg</expression>

-                    </image>

-                </cell>

-                <cell>

-                    <property name="verticalAlign">top</property>

-                    <text>

-                        <property name="contentType">html</property>

+ WHERE EmployeeID = 2</property>
+            <property name="type">JdbcSelectDataSet</property>
+        </oda-data-set>
+    </data-sets>
+    <styles>
+        <style name="Phone">
+            <property name="stringFormat">(@@@) @@@-@@@@</property>
+            <property name="showIfBlank">false</property>
+            <property name="canShrink">true</property>
+        </style>
+        <style name="My Date">
+            <property name="dateTimeFormat">Short Date</property>
+            <property name="showIfBlank">false</property>
+            <property name="canShrink">true</property>
+        </style>
+        <style name="Ident">
+            <property name="fontFamily">sans-serif</property>
+            <property name="fontSize">x-small</property>
+            <property name="fontWeight">bold</property>
+            <property name="fontStyle">normal</property>
+            <property name="color">#000000</property>
+            <property name="textLineThrough">none</property>
+            <property name="textOverline">none</property>
+            <property name="textUnderline">none</property>
+            <property name="showIfBlank">false</property>
+            <property name="canShrink">true</property>
+        </style>
+        <style name="Currency">
+            <property name="numberFormat">$##,###.##</property>
+            <property name="showIfBlank">false</property>
+            <property name="canShrink">true</property>
+        </style>
+        <style name="report">
+            <property name="fontFamily">sans-serif</property>
+        </style>
+    </styles>
+    <page-setup>
+        <simple-master-page name="Simple MasterPage">
+            <page-header>
+                <grid>
+                    <property name="width">100%</property>
+                    <column/>
+                    <row>
+                        <cell>
+                            <property name="fontSize">xx-large</property>
+                            <property name="fontWeight">bold</property>
+                            <property name="textAlign">center</property>
+                            <text>
+                                <text-property name="content"><![CDATA[Title]]></text-property>
+                            </text>
+                        </cell>
+                    </row>
+                </grid>
+            </page-header>
+            <page-footer>
+                <grid>
+                    <row>
+                        <cell>
+                            <text>
+                                <property name="contentType">html</property>
+                                <text-property name="content"><![CDATA[<value-of>new Date()</value-of>]]></text-property>
+                            </text>
+                        </cell>
+                        <cell>
+                            <property name="textAlign">right</property>
+                            <text>
+                                <text-property name="content"><![CDATA[Page:]]></text-property>
+                            </text>
+                        </cell>
+                    </row>
+                </grid>
+            </page-footer>
+        </simple-master-page>
+    </page-setup>
+    <body>
+        <grid>
+            <property name="width">100%</property>
+            <column>
+                <property name="width">25%</property>
+            </column>
+            <column>
+                <property name="width">50%</property>
+                <property name="textAlign">center</property>
+                <property name="verticalAlign">top</property>
+            </column>
+            <column>
+                <property name="width">25%</property>
+            </column>
+            <row>
+                <cell>
+                    <property name="verticalAlign">top</property>
+                    <image>
+                        <property name="height">0.594in</property>
+                        <property name="width">2.104in</property>
+                        <expression name="uri">http://www.eclipse.org/birt/examples/multichip-4.jpg</expression>
+                    </image>
+                </cell>
+                <cell>
+                    <property name="verticalAlign">top</property>
+                    <text>
+                        <property name="contentType">html</property>
                         <text-property name="content"><![CDATA[<span style="font-size: 18pt; color: #000080; font-weight: bold">
 Employee Information
 </span>
 <br>
 Confidential
-]]></text-property>

-                    </text>

-                </cell>

-                <cell>

-                    <property name="textAlign">right</property>

-                    <property name="verticalAlign">top</property>

-                    <data>

-                        <expression name="valueExpr">new Date( ); // Today's date</expression>

-                    </data>

-                </cell>

-            </row>

-            <row>

-                <property name="height">10pt</property>

-                <cell>

-                    <property name="verticalAlign">top</property>

-                </cell>

-                <cell>

-                    <property name="verticalAlign">top</property>

-                </cell>

-                <cell>

-                    <property name="textAlign">right</property>

-                    <property name="verticalAlign">top</property>

-                </cell>

-            </row>

-        </grid>

-        <grid>

-            <property name="backgroundColor">#DFDFFF</property>

-            <property name="borderBottomColor">#C0C0C0</property>

-            <property name="borderBottomStyle">solid</property>

-            <property name="borderBottomWidth">medium</property>

-            <property name="borderLeftColor">#C0C0C0</property>

-            <property name="borderLeftStyle">solid</property>

-            <property name="borderLeftWidth">thin</property>

-            <property name="borderRightColor">#C0C0C0</property>

-            <property name="borderRightStyle">solid</property>

-            <property name="borderRightWidth">medium</property>

-            <property name="borderTopColor">#C0C0C0</property>

-            <property name="borderTopStyle">solid</property>

-            <property name="borderTopWidth">thin</property>

-            <property name="width">100%</property>

-            <column>

-                <property name="width">42.5%</property>

-            </column>

-            <column>

-                <property name="width">5%</property>

-            </column>

-            <column>

-                <property name="width">42.5%</property>

-            </column>

-            <row>

-                <cell>

-                    <property name="colSpan">3</property>

-                    <property name="rowSpan">1</property>

-                    <property name="paddingTop">10pt</property>

-                    <property name="paddingLeft">10pt</property>

-                    <property name="paddingBottom">10pt</property>

-                    <property name="paddingRight">10pt</property>

-                    <grid>

-                        <property name="backgroundColor">#CACAFF</property>

-                        <property name="borderBottomColor">#808080</property>

-                        <property name="borderBottomStyle">solid</property>

-                        <property name="borderBottomWidth">medium</property>

-                        <property name="borderLeftColor">#808080</property>

-                        <property name="borderLeftStyle">solid</property>

-                        <property name="borderLeftWidth">thin</property>

-                        <property name="borderRightColor">#808080</property>

-                        <property name="borderRightStyle">solid</property>

-                        <property name="borderRightWidth">medium</property>

-                        <property name="borderTopColor">#808080</property>

-                        <property name="borderTopStyle">solid</property>

-                        <property name="borderTopWidth">thin</property>

-                        <property name="width">100%</property>

-                        <property name="dataSet">Employees</property>

-                        <column>

-                            <property name="width">50%</property>

-                            <property name="style">Ident</property>

-                            <property name="fontFamily">sans-serif</property>

-                            <property name="fontSize">x-small</property>

-                            <property name="textAlign">right</property>

-                        </column>

-                        <column>

-                            <property name="width">5%</property>

-                        </column>

-                        <column>

-                            <property name="width">45%</property>

-                        </column>

-                        <row>

-                            <cell>

-                                <label>

-                                    <text-property name="text">Employee ID:</text-property>

-                                </label>

-                            </cell>

-                            <cell/>

-                            <cell>

-                                <data>

-                                    <expression name="valueExpr">row["EmployeeID"]</expression>

-                                </data>

-                            </cell>

-                        </row>

-                        <row>

-                            <cell>

-                                <label>

-                                    <text-property name="text">Name:</text-property>

-                                </label>

-                            </cell>

-                            <cell/>

-                            <cell>

-                                <data>

+]]></text-property>
+                    </text>
+                </cell>
+                <cell>
+                    <property name="textAlign">right</property>
+                    <property name="verticalAlign">top</property>
+                    <data>
+                        <expression name="valueExpr">new Date( ); // Today's date</expression>
+                    </data>
+                </cell>
+            </row>
+            <row>
+                <property name="height">10pt</property>
+                <cell>
+                    <property name="verticalAlign">top</property>
+                </cell>
+                <cell>
+                    <property name="verticalAlign">top</property>
+                </cell>
+                <cell>
+                    <property name="textAlign">right</property>
+                    <property name="verticalAlign">top</property>
+                </cell>
+            </row>
+        </grid>
+        <grid>
+            <property name="backgroundColor">#DFDFFF</property>
+            <property name="borderBottomColor">#C0C0C0</property>
+            <property name="borderBottomStyle">solid</property>
+            <property name="borderBottomWidth">medium</property>
+            <property name="borderLeftColor">#C0C0C0</property>
+            <property name="borderLeftStyle">solid</property>
+            <property name="borderLeftWidth">thin</property>
+            <property name="borderRightColor">#C0C0C0</property>
+            <property name="borderRightStyle">solid</property>
+            <property name="borderRightWidth">medium</property>
+            <property name="borderTopColor">#C0C0C0</property>
+            <property name="borderTopStyle">solid</property>
+            <property name="borderTopWidth">thin</property>
+            <property name="width">100%</property>
+            <column>
+                <property name="width">42.5%</property>
+            </column>
+            <column>
+                <property name="width">5%</property>
+            </column>
+            <column>
+                <property name="width">42.5%</property>
+            </column>
+            <row>
+                <cell>
+                    <property name="colSpan">3</property>
+                    <property name="rowSpan">1</property>
+                    <property name="paddingTop">10pt</property>
+                    <property name="paddingLeft">10pt</property>
+                    <property name="paddingBottom">10pt</property>
+                    <property name="paddingRight">10pt</property>
+                    <grid>
+                        <property name="backgroundColor">#CACAFF</property>
+                        <property name="borderBottomColor">#808080</property>
+                        <property name="borderBottomStyle">solid</property>
+                        <property name="borderBottomWidth">medium</property>
+                        <property name="borderLeftColor">#808080</property>
+                        <property name="borderLeftStyle">solid</property>
+                        <property name="borderLeftWidth">thin</property>
+                        <property name="borderRightColor">#808080</property>
+                        <property name="borderRightStyle">solid</property>
+                        <property name="borderRightWidth">medium</property>
+                        <property name="borderTopColor">#808080</property>
+                        <property name="borderTopStyle">solid</property>
+                        <property name="borderTopWidth">thin</property>
+                        <property name="width">100%</property>
+                        <property name="dataSet">Employees</property>
+                        <column>
+                            <property name="width">50%</property>
+                            <property name="style">Ident</property>
+                            <property name="fontFamily">sans-serif</property>
+                            <property name="fontSize">x-small</property>
+                            <property name="textAlign">right</property>
+                        </column>
+                        <column>
+                            <property name="width">5%</property>
+                        </column>
+                        <column>
+                            <property name="width">45%</property>
+                        </column>
+                        <row>
+                            <cell>
+                                <label>
+                                    <text-property name="text">Employee ID:</text-property>
+                                </label>
+                            </cell>
+                            <cell/>
+                            <cell>
+                                <data>
+                                    <expression name="valueExpr">row["EmployeeID"]</expression>
+                                </data>
+                            </cell>
+                        </row>
+                        <row>
+                            <cell>
+                                <label>
+                                    <text-property name="text">Name:</text-property>
+                                </label>
+                            </cell>
+                            <cell/>
+                            <cell>
+                                <data>
                                     <expression name="valueExpr">var name = row.FirstName;
 if ( row.MiddleName != null  &amp;&amp;  row.MiddleName != "" )
 {
     name = name + " " + row.MiddleName;
 }
-name + " " + row.LastName;</expression>

-                                </data>

-                            </cell>

-                        </row>

-                        <row>

-                            <cell>

-                                <label>

-                                    <text-property name="text">Address:</text-property>

-                                </label>

-                            </cell>

-                            <cell/>

-                            <cell>

-                                <data>

-                                    <expression name="valueExpr">row["Address"]</expression>

-                                </data>

-                            </cell>

-                        </row>

-                        <row>

-                            <cell>

-                                <label>

-                                    <text-property name="text">City, State, Zip:</text-property>

-                                </label>

-                            </cell>

-                            <cell/>

-                            <cell>

-                                <text>

+name + " " + row.LastName;</expression>
+                                </data>
+                            </cell>
+                        </row>
+                        <row>
+                            <cell>
+                                <label>
+                                    <text-property name="text">Address:</text-property>
+                                </label>
+                            </cell>
+                            <cell/>
+                            <cell>
+                                <data>
+                                    <expression name="valueExpr">row["Address"]</expression>
+                                </data>
+                            </cell>
+                        </row>
+                        <row>
+                            <cell>
+                                <label>
+                                    <text-property name="text">City, State, Zip:</text-property>
+                                </label>
+                            </cell>
+                            <cell/>
+                            <cell>
+                                <text>
                                     <text-property name="content"><![CDATA[<HTML>
 <VALUE-OF>row["City"]</VALUE-OF>, 
 <VALUE-OF>row["State"]</VALUE-OF> 
 <VALUE-OF format="@@@@@-@@@@">row["PostalCode"]</VALUE-OF>
-</HTML>]]></text-property>

-                                </text>

-                            </cell>

-                        </row>

-                        <row>

-                            <cell>

-                                <label>

-                                    <text-property name="text">Home Phone:</text-property>

-                                </label>

-                            </cell>

-                            <cell/>

-                            <cell>

-                                <data>

-                                    <property name="style">Phone</property>

-                                    <expression name="valueExpr">row["HomePhone"]</expression>

-                                </data>

-                            </cell>

-                        </row>

-                        <row>

-                            <cell>

-                                <label>

-                                    <text-property name="text">Hire Date:</text-property>

-                                </label>

-                            </cell>

-                            <cell/>

-                            <cell>

-                                <data>

-                                    <property name="style">My Date</property>

-                                    <expression name="valueExpr">row["DateHired"]</expression>

-                                </data>

-                            </cell>

-                        </row>

-                    </grid>

-                </cell>

-            </row>

-            <row>

-                <cell>

-                    <property name="paddingTop">10pt</property>

-                    <property name="paddingLeft">10pt</property>

-                    <property name="paddingBottom">10pt</property>

-                    <property name="paddingRight">10pt</property>

-                    <property name="verticalAlign">top</property>

-                    <table>

-                        <property name="backgroundColor">#CACAFF</property>

-                        <property name="borderBottomColor">#7F7F7F</property>

-                        <property name="borderBottomStyle">solid</property>

-                        <property name="borderBottomWidth">medium</property>

-                        <property name="borderLeftColor">#7F7F7F</property>

-                        <property name="borderLeftStyle">solid</property>

-                        <property name="borderLeftWidth">thin</property>

-                        <property name="borderRightColor">#7F7F7F</property>

-                        <property name="borderRightStyle">solid</property>

-                        <property name="borderRightWidth">medium</property>

-                        <property name="borderTopColor">#7F7F7F</property>

-                        <property name="borderTopStyle">solid</property>

-                        <property name="borderTopWidth">thin</property>

-                        <property name="width">100%</property>

-                        <property name="dataSet">Job History</property>

-                        <column>

-                            <property name="width">35%</property>

-                        </column>

-                        <column>

-                            <property name="width">65%</property>

-                        </column>

-                        <header>

-                            <row>

-                                <cell>

-                                    <label>

-                                        <property name="style">Ident</property>

-                                        <text-property name="text">Date</text-property>

-                                    </label>

-                                </cell>

-                                <cell>

-                                    <label>

-                                        <property name="style">Ident</property>

-                                        <text-property name="text">JobTitle</text-property>

-                                    </label>

-                                </cell>

-                            </row>

-                        </header>

-                        <detail>

-                            <row>

-                                <cell>

-                                    <data>

-                                        <property name="style">My Date</property>

-                                        <expression name="valueExpr">row["JobTitleEffectiveDate"]</expression>

-                                    </data>

-                                </cell>

-                                <cell>

-                                    <data>

-                                        <expression name="valueExpr">row["JobTitle"]</expression>

-                                    </data>

-                                </cell>

-                            </row>

-                        </detail>

-                        <footer>

-                            <row>

-                                <cell/>

-                                <cell/>

-                            </row>

-                        </footer>

-                    </table>

-</cell>

-                <cell/>

-                <cell>

-                    <property name="paddingTop">10pt</property>

-                    <property name="paddingLeft">10pt</property>

-                    <property name="paddingBottom">10pt</property>

-                    <property name="paddingRight">10pt</property>

-                    <property name="verticalAlign">top</property>

-                    <table>

-                        <property name="backgroundColor">#CACAFF</property>

-                        <property name="borderBottomColor">#7F7F7F</property>

-                        <property name="borderBottomStyle">solid</property>

-                        <property name="borderBottomWidth">medium</property>

-                        <property name="borderLeftColor">#7F7F7F</property>

-                        <property name="borderLeftStyle">solid</property>

-                        <property name="borderLeftWidth">thin</property>

-                        <property name="borderRightColor">#7F7F7F</property>

-                        <property name="borderRightStyle">solid</property>

-                        <property name="borderRightWidth">medium</property>

-                        <property name="borderTopColor">#7F7F7F</property>

-                        <property name="borderTopStyle">solid</property>

-                        <property name="borderTopWidth">thin</property>

-                        <property name="width">100%</property>

-                        <property name="dataSet">Salary History</property>

-                        <column>

-                            <property name="width">33.3%</property>

-                        </column>

-                        <column>

-                            <property name="width">33.3%</property>

-                        </column>

-                        <header>

-                            <row>

-                                <cell>

-                                    <label>

-                                        <property name="style">Ident</property>

-                                        <text-property name="text">Date</text-property>

-                                    </label>

-                                </cell>

-                                <cell>

-                                    <label>

-                                        <property name="style">Ident</property>

-                                        <text-property name="text">Salary</text-property>

-                                    </label>

-                                </cell>

-                            </row>

-                        </header>

-                        <detail>

-                            <row>

-                                <cell>

-                                    <data>

-                                        <property name="style">My Date</property>

-                                        <expression name="valueExpr">row["SalaryEffectiveDate"]</expression>

-                                    </data>

-                                </cell>

-                                <cell>

-                                    <data>

-                                        <property name="style">Currency</property>

-                                        <expression name="valueExpr">row["Salary"]</expression>

-                                    </data>

-                                </cell>

-                            </row>

-                        </detail>

-                        <footer>

-                            <row>

-                                <cell/>

-                                <cell/>

-                            </row>

-                        </footer>

-                    </table>

-</cell>

-            </row>

-        </grid>

-    </body>

-    <list-property name="images">

-        <structure>

-            <property name="name">C:\Paul\Projects\Examples\multichip-4.jpg</property>

+</HTML>]]></text-property>
+                                </text>
+                            </cell>
+                        </row>
+                        <row>
+                            <cell>
+                                <label>
+                                    <text-property name="text">Home Phone:</text-property>
+                                </label>
+                            </cell>
+                            <cell/>
+                            <cell>
+                                <data>
+                                    <property name="style">Phone</property>
+                                    <expression name="valueExpr">row["HomePhone"]</expression>
+                                </data>
+                            </cell>
+                        </row>
+                        <row>
+                            <cell>
+                                <label>
+                                    <text-property name="text">Hire Date:</text-property>
+                                </label>
+                            </cell>
+                            <cell/>
+                            <cell>
+                                <data>
+                                    <property name="style">My Date</property>
+                                    <expression name="valueExpr">row["DateHired"]</expression>
+                                </data>
+                            </cell>
+                        </row>
+                    </grid>
+                </cell>
+            </row>
+            <row>
+                <cell>
+                    <property name="paddingTop">10pt</property>
+                    <property name="paddingLeft">10pt</property>
+                    <property name="paddingBottom">10pt</property>
+                    <property name="paddingRight">10pt</property>
+                    <property name="verticalAlign">top</property>
+                    <table>
+                        <property name="backgroundColor">#CACAFF</property>
+                        <property name="borderBottomColor">#7F7F7F</property>
+                        <property name="borderBottomStyle">solid</property>
+                        <property name="borderBottomWidth">medium</property>
+                        <property name="borderLeftColor">#7F7F7F</property>
+                        <property name="borderLeftStyle">solid</property>
+                        <property name="borderLeftWidth">thin</property>
+                        <property name="borderRightColor">#7F7F7F</property>
+                        <property name="borderRightStyle">solid</property>
+                        <property name="borderRightWidth">medium</property>
+                        <property name="borderTopColor">#7F7F7F</property>
+                        <property name="borderTopStyle">solid</property>
+                        <property name="borderTopWidth">thin</property>
+                        <property name="width">100%</property>
+                        <property name="dataSet">Job History</property>
+                        <column>
+                            <property name="width">35%</property>
+                        </column>
+                        <column>
+                            <property name="width">65%</property>
+                        </column>
+                        <header>
+                            <row>
+                                <cell>
+                                    <label>
+                                        <property name="style">Ident</property>
+                                        <text-property name="text">Date</text-property>
+                                    </label>
+                                </cell>
+                                <cell>
+                                    <label>
+                                        <property name="style">Ident</property>
+                                        <text-property name="text">JobTitle</text-property>
+                                    </label>
+                                </cell>
+                            </row>
+                        </header>
+                        <detail>
+                            <row>
+                                <cell>
+                                    <data>
+                                        <property name="style">My Date</property>
+                                        <expression name="valueExpr">row["JobTitleEffectiveDate"]</expression>
+                                    </data>
+                                </cell>
+                                <cell>
+                                    <data>
+                                        <expression name="valueExpr">row["JobTitle"]</expression>
+                                    </data>
+                                </cell>
+                            </row>
+                        </detail>
+                        <footer>
+                            <row>
+                                <cell/>
+                                <cell/>
+                            </row>
+                        </footer>
+                    </table>
+</cell>
+                <cell/>
+                <cell>
+                    <property name="paddingTop">10pt</property>
+                    <property name="paddingLeft">10pt</property>
+                    <property name="paddingBottom">10pt</property>
+                    <property name="paddingRight">10pt</property>
+                    <property name="verticalAlign">top</property>
+                    <table>
+                        <property name="backgroundColor">#CACAFF</property>
+                        <property name="borderBottomColor">#7F7F7F</property>
+                        <property name="borderBottomStyle">solid</property>
+                        <property name="borderBottomWidth">medium</property>
+                        <property name="borderLeftColor">#7F7F7F</property>
+                        <property name="borderLeftStyle">solid</property>
+                        <property name="borderLeftWidth">thin</property>
+                        <property name="borderRightColor">#7F7F7F</property>
+                        <property name="borderRightStyle">solid</property>
+                        <property name="borderRightWidth">medium</property>
+                        <property name="borderTopColor">#7F7F7F</property>
+                        <property name="borderTopStyle">solid</property>
+                        <property name="borderTopWidth">thin</property>
+                        <property name="width">100%</property>
+                        <property name="dataSet">Salary History</property>
+                        <column>
+                            <property name="width">33.3%</property>
+                        </column>
+                        <column>
+                            <property name="width">33.3%</property>
+                        </column>
+                        <header>
+                            <row>
+                                <cell>
+                                    <label>
+                                        <property name="style">Ident</property>
+                                        <text-property name="text">Date</text-property>
+                                    </label>
+                                </cell>
+                                <cell>
+                                    <label>
+                                        <property name="style">Ident</property>
+                                        <text-property name="text">Salary</text-property>
+                                    </label>
+                                </cell>
+                            </row>
+                        </header>
+                        <detail>
+                            <row>
+                                <cell>
+                                    <data>
+                                        <property name="style">My Date</property>
+                                        <expression name="valueExpr">row["SalaryEffectiveDate"]</expression>
+                                    </data>
+                                </cell>
+                                <cell>
+                                    <data>
+                                        <property name="style">Currency</property>
+                                        <expression name="valueExpr">row["Salary"]</expression>
+                                    </data>
+                                </cell>
+                            </row>
+                        </detail>
+                        <footer>
+                            <row>
+                                <cell/>
+                                <cell/>
+                            </row>
+                        </footer>
+                    </table>
+</cell>
+            </row>
+        </grid>
+    </body>
+    <list-property name="images">
+        <structure>
+            <property name="name">C:\Paul\Projects\Examples\multichip-4.jpg</property>
             <property name="data">
                 /9j/4AAQSkZJRgABAgECWAJYAAD/wAARCAA5AMoDASIAAhEBAxEB/9sAhAAFAwMEAwMFBAQEBQUFBgcN
                 CAcHBwcQCwwJDRMQFBMSEBISFRceGRUWHBYSEhojGhwfICEiIRQZJSckICceISEgAQUFBQcGBw8ICA8g
@@ -589,7 +589,7 @@
                 qoWCqCTliSR0r0+igDzjx34N8UWHxCsfiH4Lhsb+9j046XqWl3k5gW7t9/mIY5ACEkVi3UYIYjiqPws8
                 Ea3YfE3xB4vv/COmeFbTUdNtrSOytbmOVnkSSV3lby1C5PmAdzxXqtFAHDfEHwXqPiPx54B1izhhe10P
                 Uri4vC7AFUe2kjXaO/zMtdzRRQAUUUUAf//Z
-            </property>

-        </structure>

-    </list-property>

-</report>

+            </property>
+        </structure>
+    </list-property>
+</report>
diff --git a/home-page-one-liner.html b/home-page-one-liner.html
new file mode 100644
index 0000000..9f5f414
--- /dev/null
+++ b/home-page-one-liner.html
@@ -0,0 +1 @@
+<a href="/birt/">Business Intelligence and Reporting Tools (BIRT)</a>
\ No newline at end of file
diff --git a/images/birt_logotype.jpg b/images/birt_logotype.jpg
new file mode 100644
index 0000000..e5d9c8d
--- /dev/null
+++ b/images/birt_logotype.jpg
Binary files differ
diff --git a/images/birt_logotype_small.jpg b/images/birt_logotype_small.jpg
new file mode 100644
index 0000000..d7d2111
--- /dev/null
+++ b/images/birt_logotype_small.jpg
Binary files differ
diff --git a/images/errordata.jpg b/images/errordata.jpg
deleted file mode 100644
index f705071..0000000
--- a/images/errordata.jpg
+++ /dev/null
Binary files differ
diff --git a/images/rcp.jpg b/images/rcp.jpg
deleted file mode 100644
index 8501b2e..0000000
--- a/images/rcp.jpg
+++ /dev/null
Binary files differ
diff --git a/include/body.inc b/include/body.inc
index 9c71011..6ab9db0 100644
--- a/include/body.inc
+++ b/include/body.inc
@@ -128,7 +128,7 @@
 END;
 	if ( count( $jumpName ) > 0 ) echo " rowspan=2";
 	echo <<<END
-><img src="$birtHome/images/Idea.jpg"></td>
+><img src="$birtHome/images/birt_logotype_small.jpg"></td>
 </tr>
 
 END;
diff --git a/main.html b/main.html
index a4fe636..4a3cfc2 100644
--- a/main.html
+++ b/main.html
@@ -58,18 +58,18 @@
 <dt><a href="wiki/index.php?n=FAQ.FAQ">FAQ</a></dt>
 <dd>A summary of questions asked & answered in the newsgroup, delivered via the BIRT Wiki.</dd>
 
-<dt><a href="wiki">Wiki</a></dt>
-<dd>Community-developed knowledge base for BIRT.</dd>
-
 <dt><a href="community.html">Community</a></dt>
 <dd>Other community resources, including the newsgroup, mailing lists, bugzilla, etc.</dd>
 
 <dt><a href="ref">Reference</a></dt>
 <dd>Reference information on BIRT's report design format: the Report Object Model (ROM).</dd>
 
-<dt><a href="project">Project</a></dt>
+<dt><a href="project">Project Organization</a></dt>
 <dd>Information on the BIRT project, including charter, leadership, organization, etc.</dd>
 
+<dt><a href="project/PlanAndDeliverables.html">Project Development Plan</a></dt>
+<dd>Contains information on the project release schedule, project plan, and feature sets.</dd>
+
 <dt><a href="build">Building BIRT</a></dt>
 <dd>How to check out and build the BIRT source code.</dd>
 
@@ -80,6 +80,42 @@
 <h1>What's New</h1>
 
 <dl class="date-list">
+<dt>January 22</dt>
+<dd><a href="http://download.eclipse.org/birt/downloads">BIRT 2.0</a>
+is now available for download.  Read about the feature set at <a href="project/notable2.0.html">Notable Features - BIRT 2.0</a> </dd>
+
+
+<dt>January 16</dt>
+<dd><a href="http://www.eclipse.org/birt/index.php?page=project/pmc.html">The BIRT PMC</a> is pleased to announce 
+that Mike Fox, from IBM / Rational, has joined the Committee.</dd>
+
+<dt>January 4</dt>
+<dd><a href="http://download.eclipse.org/birt/downloads">BIRT 2.0 Release Candidate</a>
+is available for download.</dd>
+
+<dt>December 7</dt>
+<dd><a href="http://download.eclipse.org/birt/downloads">BIRT 2.0 Milestone 3</a>
+can now be downloaded.  Read about the feature set at <a href="project/notable2.0M3.html">Notable Features - BIRT 2.0 M3</a> </dd>
+
+
+<dt>November 3</dt>
+<dd><a href="http://download.eclipse.org/birt/downloads/examples/misc/BIRT/BIRT_demo_Camv3.html" target="_blank" class="top">A new BIRT Demo</a> is available for viewing.</dd>
+
+
+<dt>October 31</dt>
+<dd><a href="http://download.eclipse.org/birt/downloads">BIRT 2.0 Milestone 2</a>
+is available for download.  Read about the feature set at <a href="project/notable2.0M2.html">Notable Features - BIRT 2.0 M2</a> </dd>
+
+
+<dt>October 21</dt>
+<dd><a href="examples">New Examples</a> The examples have been restructured and many new examples are available.
+</dd>
+
+<dt>October 21</dt>
+<dd><a href="project/PlanAndDeliverables.html">New Project Plan Page</a> This page contains information on the project plan and
+the milestone dates for BIRT 2.0.  In addition the page contains bugzilla queries for feature and bug fixes for each milestone.
+</dd>
+
 <dt>Setptember 30</dt>
 <dd><a href="project/project_plan_R2_0_0_Draft.html">BIRT Release 2.0 DRAFT Project Plan</a> Take a look at the projects<br>
 that are being implemented for BIRT 2.0.  The 2.0 Milestone 1 release is available on the <a href="http://download.eclipse.org/birt/downloads/">downloads</a> page  
@@ -93,24 +129,7 @@
 <a href="presos/Eclipse BIRT Project Mastering BIRT.pdf">Mastering BIRT</a> - Exploring BIRT Extensions <br>  
 <a href="presos/Eclipse BIRT Plugin Map.pdf">BIRT Plugin Map</a> - BIRT Projects and Extension Points<br>  
 </dd>
-
-<dt>August 17</dt>
-<dd><a href="notable.html">Notable Features - BIRT 1.0.1</a>  Take a look at some of 
-the features that are supplied with BIRT 1.0.1
-</dd>
-
-<dt>August 5</dt>
-<dd><a href="http://download.eclipse.org/birt/downloads">BIRT 1.0.1</a>
-is available for download.  An example of deploying BIRT using the Eclipse Rich Client Platform (RCP) is also available.</dd>
-
-<dt>June 24</dt>
-<dd>Flash movie showing creation of &quot;My First Report&quot; available. Check the <a href="tutorial">Tutorial Page</a>.</dd>
   
-<dt>June 20</dt>
-<dd><a href="project/project_plan_R1_0_1.html">BIRT 1.0.1 Project Plan</a>
-available.</dd>
-
-
 </dl>
 <b><a href="whatsnew.html">More of What's New...</a></b>
 
@@ -126,6 +145,11 @@
 <a href="" target="_blank">xxx</a>
 </dd>
 -->
+<dt>November 16</dt>
+<dd><a href="http://dev.mysql.com/tech-resources/articles/using-birt/" target="_blank">Using BIRT To Report On Bugzilla in MySQL</a>
+from
+<a href="http://www.mysql.com/" target="_blank">MySQL</a>.
+</dd>
 
 <dt>September 28</dt>
 <dd><a href="http://www.informationweek.com/story/showArticle.jhtml?articleID=171200352&pgno=1" target="_blank"> Open Source Goes Corporate</a>
@@ -160,12 +184,6 @@
 <a href="http://www.bizintelligencepipeline.com" target="_blank">BizIntelligencePipeline</a>.
 </dd>
 
-<dt>June 7</dt>
-<dd><a href="http://www.golem.de/0506/38502.html" target="_blank">
-Eclipse bekommt "Business Intelligence"</a>
-from
-<a href="http://www.golem.de/" target="_blank">golem.de</a> (in German).
-</dd>
 </dl>
 
 <b><a href="news.html">More News...</a></b>
diff --git a/menu.txt b/menu.txt
index 6d928c7..5baca8f 100644
--- a/menu.txt
+++ b/menu.txt
@@ -9,7 +9,6 @@
 <item name="examples" page="examples"/>
 <item name="integration" page="deploy"/>
 <item name="faq" url="wiki/index.php?n=FAQ.FAQ"/>
-<item name="wiki" url="wiki"/>
 <not-yet-item name="building reports" page="reports"/>
 <not-yet-item name="integration" page="integ"/>
 <not-yet-item name="maintenance" page="maint"/>
@@ -18,7 +17,8 @@
 <not-yet-item name="extensions" page="extn"/>
 <item name="reference" page="ref"/>
 <not-yet-space/>
-<item name="project" page="project"/>
+<item name="project org" page="project"/>
+<item name="project plan" page="project/PlanAndDeliverables.html"/>
 <item name="building birt" page="build"/>
 <item name="search" page="search.html"/>
 </birt-menu>
\ No newline at end of file
diff --git a/news.html b/news.html
index 05c825f..1db772a 100644
--- a/news.html
+++ b/news.html
@@ -21,6 +21,12 @@
 </dd>
 -->
 
+<dt>November 16</dt>
+<dd><a href="http://dev.mysql.com/tech-resources/articles/using-birt/" target="_blank">Using BIRT To Report On Bugzilla in MySQL</a>
+from
+<a href="http://www.mysql.com/" target="_blank">MySQL</a>.
+</dd>
+
 <dt>September 28</dt>
 <dd><a href="http://www.informationweek.com/story/showArticle.jhtml?articleID=171200352&pgno=1" target="_blank"> Open Source Goes Corporate</a>
 from
diff --git a/project-page-paragraph.html b/project-page-paragraph.html
new file mode 100644
index 0000000..fe9c6c8
--- /dev/null
+++ b/project-page-paragraph.html
@@ -0,0 +1,11 @@
+<p><b><a href="/birt/">Business Intelligence and Reporting Tools</a></b> <br/>
+<p>The BIRT project provides a business intelligence and reporting framework that
+ integrates easily with existing infrastructure and applications.  
+ The project provides extensible tools and APIs for building and deploying reports 
+ to environments ranging from Java/J2EE to PHP -- both web and desktop, 
+ including Eclipse-based applications. BIRT is based on open source standards, 
+ and allows designers to provide functionality for data mining and analysis, 
+ drill through and SVG rendered interactive graphs.  
+ The BIRT platform is extensible, facilitating the input of new data sources, 
+ export of custom formats and support of custom report components. 
+</p>
diff --git a/project/PlanAndDeliverables.html b/project/PlanAndDeliverables.html
new file mode 100644
index 0000000..cb56a02
--- /dev/null
+++ b/project/PlanAndDeliverables.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>Eclipse BIRT Project</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">2.0 BIRT Project Plan and Deliverables</p>
+<p class="subhead">Project Information</p>
+
+<h1>Introduction</h1>
+<p>
+Welcome to the Business Intelligence and Reporting Tools (BIRT) 
+Project pages. This page contains the Project Plan for the version of BIRT that is currently
+in Development.  Selecting the milestone within the Milestone Planning List will allow you to see what 
+features and bug fixes will be available in future milestones.</p>
+
+<h1>Project Plan</h1>
+
+<dl class="arrow-list">
+<dt><a href="project_plan_R2_0_0.html">2.0 Project Plan</a></dt>
+<dd>The plans for the 2.0 release.</dd>
+
+<dt><a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS">BIRT Project Specifications</a></dt>
+<dd>The project specifications detail proposed functionality for future releases of BIRT.  Within the project plan, each BPS that is referenced for this release will be hyperlinked.</dd>
+</dl>
+
+<h1>Milestone Dates</h1>
+<p>
+Listed below are the milestone dates for this release of BIRT.
+</p>
+
+<dl class="arrow-list">
+<dt>Friday, September 16, 2005</dt><dd> BIRT 2.0 M1</dd>
+<dt>Monday, October 24, 2005</dt><dd> BIRT 2.0 M2 </dd>
+<dt>Monday, November 21, 2005</dt><dd> BIRT 2.0 M3</dd> 
+<dt>Monday, December 30, 2005</dt><dd> BIRT 2.0 Release Candidate</dd> 
+<dt>Friday, January 20, 2006</dt><dd> BIRT 2.0 Final</dd> 
+</dl>
+
+<h1>Milestone Planning</h1>
+Below is a list of the milestone builds.  Each item has a link for the bug fixes and new features which are scheduled for each milestone.
+The FINAL links include all features and bug fixes for the release in total.
+<dl class="arrow-list">
+
+<dt>BIRT 2.0 M1 </dt><dd> <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=BIRT&target_milestone=2.0.0+M1&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_severity=enhancement&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Features</a> List, <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=BIRT&target_milestone=2.0.0+M1&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Bug</a> Fixes</dd>
+<dt>BIRT 2.0 M2 </dt><dd> <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=BIRT&target_milestone=2.0.0+M2&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_severity=enhancement&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Features</a> List, <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=BIRT&target_milestone=2.0.0+M2&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Bug</a> Fixes  <a href="notable2.0M2.html"> Notable Features - BIRT 2.0 M2</a></dd>
+<dt>BIRT 2.0 M3 </dt><dd><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=BIRT&target_milestone=2.0.0+M3&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_severity=enhancement&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Features</a> List, <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=BIRT&target_milestone=2.0.0+M3&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Bug</a> Fixes <a href="notable2.0M3.html"> Notable Features - BIRT 2.0 M3</a></dd>
+<dt>BIRT 2.0 FINAL </dt><dd> <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=BIRT&target_milestone=2.0.0+Final&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_severity=enhancement&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Features</a> List, <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=BIRT&target_milestone=2.0.0+Final&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Bug</a> Fixes <a href="notable2.0.html"> Notable Features - BIRT 2.0</a></dd>
+
+<br>
+<dt>BIRT 2.0 </dt><dd> <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=BIRT&target_milestone=2.0.0+Final&target_milestone=2.0.0+M1&target_milestone=2.0.0+M2&target_milestone=2.0.0+M3&target_milestone=2.0.0+M4&target_milestone=2.0.0+M5&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_severity=enhancement&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">All Feautres</a> Scheduled, <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=BIRT&target_milestone=2.0.0+Final&target_milestone=2.0.0+M1&target_milestone=2.0.0+M2&target_milestone=2.0.0+M3&target_milestone=2.0.0+M4&target_milestone=2.0.0+M5&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">All Bug</a> Fixes Scheduled</dd>
+</dl>
+
+<h1>Archive</h1>
+<p>
+This section contains links to information used in the development process for prior versions of BIRT.
+<dl class="arrow-list">
+<dt><a href="archived.html">Archived Development Plans</a></dt><dd>1.0 and 1.0.1 Releases</dd>
+</dl>
+</p>
+
+</body>
+</html>
+
diff --git a/project/archived.html b/project/archived.html
new file mode 100644
index 0000000..69a3a48
--- /dev/null
+++ b/project/archived.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>Eclipse BIRT Project Plan Archive</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Project</p>
+<p class="subhead">1.0 and 1.0.1 Project Archived Information</p>
+
+
+
+<h1>Project Resources</h1>
+Resources used in version 1.0 and 1.0.1 development.
+<dl class="arrow-list">
+
+<dt><a href="notable1.0.1.html">1.0.1 New and Notable Features</a></dt>
+<dd>New and Notable Features within BIRT 1.0.1.</dd>
+
+<dt><a href="project_plan_R1_0_1.html">1.0.1 Project Plan</a></dt>
+<dd>The plans for the 1.0.1 release.</dd>
+
+<dt><a href="summary_plan.html">1.0 Project Plan Summary</a></dt>
+<dd>The broad themes for the next several releases.</dd>
+
+<dt><a href="R1_Requirements.pdf">Release 1.0 BIRT Requirements</a></dt>
+<dd>Requirements for capabilities that were included in BIRT Release 1.0.</dd>
+
+<dt><a href="Eclipse_BIRT_Project_1_0_Release_Review_2005-04-28.pdf">BIRT Project
+1.0 Release Review presentation</a></dt>
+<dd>Slides used during the formal release review of the BIRT 1.0 project.</dd>
+
+</dl>
+
+
+</body>
+</html>
+
diff --git a/project/contributors.html b/project/contributors.html
index 223f5c7..8f14ba7 100644
--- a/project/contributors.html
+++ b/project/contributors.html
@@ -23,8 +23,18 @@
 <dt>Innovent Solutions</dt>
 <dd><a href="http://www.innoventsolutions.com" target="_blank">
 http://www.innoventsolutions.com</a></dd>
+
+
+<dt>IBM</dt>
+<dd><a href="http://www.ibm.com" target="_blank">
+http://www.ibm.com</a></dd>
 </dl>
 
+BIRT uses the standard Eclipse process to elect new committers. The list of
+current committers is
+<a href="http://eclipse.org/birt/commit.html">here</a>.
+
+
 <h1>Project Participants</h1>
 
 <p>Companies or entities that are providing feedback on requirements, design 
diff --git a/project/images/Datasource1.jpg b/project/images/Datasource1.jpg
new file mode 100644
index 0000000..a6de843
--- /dev/null
+++ b/project/images/Datasource1.jpg
Binary files differ
diff --git a/project/images/PropertyBinding.jpg b/project/images/PropertyBinding.jpg
new file mode 100644
index 0000000..1a55523
--- /dev/null
+++ b/project/images/PropertyBinding.jpg
Binary files differ
diff --git a/project/images/ScriptEditor.jpg b/project/images/ScriptEditor.jpg
new file mode 100644
index 0000000..0614cc3
--- /dev/null
+++ b/project/images/ScriptEditor.jpg
Binary files differ
diff --git a/project/images/StoredProcs.JPG b/project/images/StoredProcs.JPG
new file mode 100644
index 0000000..404ea6e
--- /dev/null
+++ b/project/images/StoredProcs.JPG
Binary files differ
diff --git a/project/images/TemplateItem.jpg b/project/images/TemplateItem.jpg
new file mode 100644
index 0000000..11f27ed
--- /dev/null
+++ b/project/images/TemplateItem.jpg
Binary files differ
diff --git a/project/images/TemplateItemDetail.jpg b/project/images/TemplateItemDetail.jpg
new file mode 100644
index 0000000..05f7d82
--- /dev/null
+++ b/project/images/TemplateItemDetail.jpg
Binary files differ
diff --git a/project/images/TemplatePublish.jpg b/project/images/TemplatePublish.jpg
new file mode 100644
index 0000000..fd6dfff
--- /dev/null
+++ b/project/images/TemplatePublish.jpg
Binary files differ
diff --git a/project/images/TemplateUsage.jpg b/project/images/TemplateUsage.jpg
new file mode 100644
index 0000000..2978032
--- /dev/null
+++ b/project/images/TemplateUsage.jpg
Binary files differ
diff --git a/project/images/aggr1a.jpg b/project/images/aggr1a.jpg
new file mode 100644
index 0000000..edc3a11
--- /dev/null
+++ b/project/images/aggr1a.jpg
Binary files differ
diff --git a/project/images/aggr2a.jpg b/project/images/aggr2a.jpg
new file mode 100644
index 0000000..830a385
--- /dev/null
+++ b/project/images/aggr2a.jpg
Binary files differ
diff --git a/project/images/blobtype.JPG b/project/images/blobtype.JPG
new file mode 100644
index 0000000..5918c7d
--- /dev/null
+++ b/project/images/blobtype.JPG
Binary files differ
diff --git a/project/images/chart1a.jpg b/project/images/chart1a.jpg
new file mode 100644
index 0000000..bd6d1fc
--- /dev/null
+++ b/project/images/chart1a.jpg
Binary files differ
diff --git a/project/images/chart2a.jpg b/project/images/chart2a.jpg
new file mode 100644
index 0000000..b8adc17
--- /dev/null
+++ b/project/images/chart2a.jpg
Binary files differ
diff --git a/project/images/chart3a.jpg b/project/images/chart3a.jpg
new file mode 100644
index 0000000..a6d473a
--- /dev/null
+++ b/project/images/chart3a.jpg
Binary files differ
diff --git a/project/images/dynp1b.JPG b/project/images/dynp1b.JPG
new file mode 100644
index 0000000..097e6f3
--- /dev/null
+++ b/project/images/dynp1b.JPG
Binary files differ
diff --git a/project/images/dynp2b.JPG b/project/images/dynp2b.JPG
new file mode 100644
index 0000000..93a7ae0
--- /dev/null
+++ b/project/images/dynp2b.JPG
Binary files differ
diff --git a/project/images/dynp3a.JPG b/project/images/dynp3a.JPG
new file mode 100644
index 0000000..ab2679c
--- /dev/null
+++ b/project/images/dynp3a.JPG
Binary files differ
diff --git a/project/images/dynp4a.JPG b/project/images/dynp4a.JPG
new file mode 100644
index 0000000..c943c85
--- /dev/null
+++ b/project/images/dynp4a.JPG
Binary files differ
diff --git a/project/images/export1.jpg b/project/images/export1.jpg
new file mode 100644
index 0000000..d35fcba
--- /dev/null
+++ b/project/images/export1.jpg
Binary files differ
diff --git a/project/images/export3a.png b/project/images/export3a.png
new file mode 100644
index 0000000..1134f58
--- /dev/null
+++ b/project/images/export3a.png
Binary files differ
diff --git a/project/images/express1.JPG b/project/images/express1.JPG
new file mode 100644
index 0000000..d336791
--- /dev/null
+++ b/project/images/express1.JPG
Binary files differ
diff --git a/project/images/importcss.JPG b/project/images/importcss.JPG
new file mode 100644
index 0000000..7421280
--- /dev/null
+++ b/project/images/importcss.JPG
Binary files differ
diff --git a/project/images/interactcol.jpg b/project/images/interactcol.jpg
new file mode 100644
index 0000000..0e03f26
--- /dev/null
+++ b/project/images/interactcol.jpg
Binary files differ
diff --git a/project/images/javaevent1.jpg b/project/images/javaevent1.jpg
new file mode 100644
index 0000000..c5b1fbd
--- /dev/null
+++ b/project/images/javaevent1.jpg
Binary files differ
diff --git a/project/images/javaevent2.jpg b/project/images/javaevent2.jpg
new file mode 100644
index 0000000..636e2a0
--- /dev/null
+++ b/project/images/javaevent2.jpg
Binary files differ
diff --git a/project/images/javaevent3.jpg b/project/images/javaevent3.jpg
new file mode 100644
index 0000000..ec4b5d6
--- /dev/null
+++ b/project/images/javaevent3.jpg
Binary files differ
diff --git a/project/images/lib3a.jpg b/project/images/lib3a.jpg
new file mode 100644
index 0000000..fd766c7
--- /dev/null
+++ b/project/images/lib3a.jpg
Binary files differ
diff --git a/project/images/lib5a.jpg b/project/images/lib5a.jpg
new file mode 100644
index 0000000..c5f34b5
--- /dev/null
+++ b/project/images/lib5a.jpg
Binary files differ
diff --git a/project/images/templ2a.jpg b/project/images/templ2a.jpg
new file mode 100644
index 0000000..633db0e
--- /dev/null
+++ b/project/images/templ2a.jpg
Binary files differ
diff --git a/project/images/templ4a.jpg b/project/images/templ4a.jpg
new file mode 100644
index 0000000..adcd454
--- /dev/null
+++ b/project/images/templ4a.jpg
Binary files differ
diff --git a/project/images/templ5a.jpg b/project/images/templ5a.jpg
new file mode 100644
index 0000000..ade6caa
--- /dev/null
+++ b/project/images/templ5a.jpg
Binary files differ
diff --git a/project/images/templsnippet.jpg b/project/images/templsnippet.jpg
new file mode 100644
index 0000000..e60d7a9
--- /dev/null
+++ b/project/images/templsnippet.jpg
Binary files differ
diff --git a/project/images/toc.jpg b/project/images/toc.jpg
new file mode 100644
index 0000000..ede1ca1
--- /dev/null
+++ b/project/images/toc.jpg
Binary files differ
diff --git a/project/images/url2a.jpg b/project/images/url2a.jpg
new file mode 100644
index 0000000..64106c6
--- /dev/null
+++ b/project/images/url2a.jpg
Binary files differ
diff --git a/project/images/url3a.jpg b/project/images/url3a.jpg
new file mode 100644
index 0000000..b220c40
--- /dev/null
+++ b/project/images/url3a.jpg
Binary files differ
diff --git a/project/images/xml2.jpg b/project/images/xml2.jpg
new file mode 100644
index 0000000..ce2d38e
--- /dev/null
+++ b/project/images/xml2.jpg
Binary files differ
diff --git a/project/images/xml3.jpg b/project/images/xml3.jpg
new file mode 100644
index 0000000..827f5ec
--- /dev/null
+++ b/project/images/xml3.jpg
Binary files differ
diff --git a/project/images/xmleditor.JPG b/project/images/xmleditor.JPG
new file mode 100644
index 0000000..d269a31
--- /dev/null
+++ b/project/images/xmleditor.JPG
Binary files differ
diff --git a/project/main.html b/project/main.html
index bece920..27aad83 100644
--- a/project/main.html
+++ b/project/main.html
@@ -10,7 +10,7 @@
 <body>
 
 <p class="head">BIRT Project</p>
-<p class="subhead">Project Information</p>
+<p class="subhead">Project Organization</p>
 
 <h1>Project Organization</h1>
 
@@ -59,28 +59,12 @@
 <dt><a href="principles.html">Project Principles</a></dt>
 <dd>The key principles on which this project is run.</dd>
 
-<dt><a href="summary_plan.html">Project Plan Summary</a></dt>
-<dd>The broad themes for the next several releases.</dd>
-
-<dt><a href="project_plan_R2_0_0_Draft.html">2.0 Project Plan</a></dt>
-<dd>The plans for the 2.0 release.</dd>
-
-<dt><a href="project_plan_R1_0_1.html">1.0.1 Project Plan</a></dt>
-<dd>The plans for the 1.0.1 release.</dd>
-
 <dt><a href="pmc.html">Project Management Committee (PMC) and Project Leads</a></dt>
 <dd>Who is running the project?</dd>
 
 <dt><a href="contributors.html">Project Contributors and Committers</a></dt>
 <dd>List of the project contributors and committers.</dd>
 
-<dt><a href="R1_Requirements.pdf">Release 1.0 BIRT Requirements</a></dt>
-<dd>Requirements for capabilities that were included in BIRT Release 1.0.</dd>
-
-<dt><a href="Eclipse_BIRT_Project_1_0_Release_Review_2005-04-28.pdf">BIRT Project
-1.0 Release Review presentation</a></dt>
-<dd>Slides used during the formal release review of the BIRT 1.0 project.</dd>
-
 </dl>
 
 <h1>PMC Minutes</h1>
@@ -139,12 +123,6 @@
 needs for ad hoc report creation by business users within any java application.</dd>
 </dl>
 
-<h1>Committers</h1>
-<p>
-BIRT uses the standard Eclipse process to elect new committers. The list of
-current committers is
-<a href="http://eclipse.org/birt/commit.html">here</a>.
-
 </body>
 </html>
 
diff --git a/project/menu.txt b/project/menu.txt
index e1ca9fa..f268ff8 100644
--- a/project/menu.txt
+++ b/project/menu.txt
@@ -1,17 +1,18 @@
 <birt-menu>
-<top name="project" page="../project"/>
-<item name="description" page="description.html"/>
-<item name="charter" page="charter.html"/>
-<item name="principles" page="principles.html"/>
-<item name="PMC" page="pmc.html"/>
-<item name="contributors" page="contributors.html"/>
+<top name="project org" page="../project"/>
+<top name="project plan" page="../project/PlanAndDeliverables.html"/>
+<item-gone name="description" page="description.html"/>
+<item-gone name="charter" page="charter.html"/>
+<item-gone name="principles" page="principles.html"/>
+<item-gone name="PMC" page="pmc.html"/>
+<item-gone name="contributors" page="contributors.html"/>
 <not-yet-space/>
-<item name="summary plan" page="summary_plan.html"/>
-<item name="project plan" page="project_plan_R1_0_1.html"/>
-<item name="1.0 review" url="Eclipse_BIRT_Project_1_0_Release_Review_2005-04-28.pdf"/>
+<item-gone name="summary plan" page="summary_plan.html"/>
+<item-gone name="project plan" page="project_plan_R1_0_1.html"/>
+<item-gone name="1.0 review" url="Eclipse_BIRT_Project_1_0_Release_Review_2005-04-28.pdf"/>
 <not-yet-space/>
-<item name="ECE project" url="http://www.eclipse.org/ece"/>
-<item name="ERD project" url="http://www.eclipse.org/erd"/>
-<item name="ERE project" url="http://www.eclipse.org/ere"/>
-<item name="WRD project" url="http://www.eclipse.org/wrd"/>
+<item-gone name="ECE project" url="http://www.eclipse.org/ece"/>
+<item-gone name="ERD project" url="http://www.eclipse.org/erd"/>
+<item-gone name="ERE project" url="http://www.eclipse.org/ere"/>
+<item-gone name="WRD project" url="http://www.eclipse.org/wrd"/>
 </birt-menu>
\ No newline at end of file
diff --git a/project/new.gif b/project/new.gif
new file mode 100644
index 0000000..3ef5f5e
--- /dev/null
+++ b/project/new.gif
Binary files differ
diff --git a/project/notable1.0.1.html b/project/notable1.0.1.html
new file mode 100644
index 0000000..bcc37ca
--- /dev/null
+++ b/project/notable1.0.1.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>New and Notable Features within BIRT 1.0.1</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Project</p>
+<p class="subhead">New and Notable</p>
+
+<h1>Support for Eclipse 3.1</h1>
+<p>BIRT 1.0.1 provides support for the Eclipse 3.1 platform release.</p>
+
+<h1>RCP Report Designer</h1>
+<p>The Eclipse Rich Client Platform (RCP) enables ISVs and enterprise developers to leverage Eclipse technology to quickly create highly functional applications for their user community based on a common framework. BIRT 1.0.1 includes an example RCP implementation of BIRT that illustrates how RCP can be used to broaden the appeal and usage of BIRT technology. The BIRT RCP Report Designer is an example of providing a simpler tool that is dedicated to the task of report development – without the additional complexities of the IDE, which is unfamiliar to the typical report developer.</p>
+<img src="../images/rcp.jpg" width="798" height="570"/>
+<h1>Visual Indication of Problems in a Report</h1>
+<p>When a BIRT report has a problem detected in it, an error icon is displayed alerting the developer to the existence of the problem. For example, when the data source is deleted an error icon is displayed next to the dependent data set.<p>
+<img src="../images/errordata.jpg" width="221" height="112"/>
+
+<h1>Map Feature for Easy Decoding of Database Values</h1>
+<p>An easy way to map data values is now available in the property editor. For example, to map credit rank codes, "A" and "B" to “Excellent" and "Standard", you would use the Map feature, which is available as a tab under the property editor view, as shown in the following illustration.</p>
+<img src="../images/map.jpg" width="728" height="285"/>
+<p>When BIRT generates a report that displays values from the data column specified in the Condition, the defined Display Value is used in place of the actual data value. The report displays unmapped values without changing them, as shown in the following illustration.</p>
+<img src="../images/mapresults.jpg" width="329" height="227"/>
+<h1>Easy Deployability</h1>
+<p>The BIRT 1.0.1 Runtime Engine is now available as WAR file allowing it to be deployed in application servers.</p>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/project/notable2.0.html b/project/notable2.0.html
new file mode 100644
index 0000000..4b53a9f
--- /dev/null
+++ b/project/notable2.0.html
@@ -0,0 +1,165 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>New and Notable Features within BIRT 2.0</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Project</p>
+<p class="subhead">New and Notable BIRT 2.0</p>
+
+<h1>General</h1>
+<p>The BIRT Team is pleased announce the release of BIRT 2.0.</p>
+<p>BIRT now supports HTML pagination, CSV output, and a Table Of Contents with the supplied BIRT Viewer.  In addition, features such as Libraries, Templates, Multi-Pass aggregates, flexible Charting Wizard and XML as a data source all contribute to making BIRT 2.0 a powerful platform for your reporting needs.</p>
+<p>This release represents the culmination of a community-driven development cycle that has facilitated the development of quite a list of features and functions.  Some of these features are highlighted below, but the complete list for 2.0 is available
+<a href=http://www.eclipse.org/birt/index.php?page=project/project_plan_R2_0_0.html>here</a></p>
+<p>The BIRT Team would like to thank the BIRT community for the valuable feedback and support you have provided.
+</p>
+<h1>New BIRT Viewer</h1>
+<p>Traversing a large HTML report to locate a particular piece of information can be cumbersome.  To allow better navigation of report data, BIRT 2.0 features a new and improved Viewer, based on AJAX technology.  The new Viewer paginates the emitted HTML following report design properties, allowing it to display pages on demand via the page controls in the Viewer navigation bar.</p>
+<p>In addition to pagination, the new Viewer supports Table Of Contents (TOC) functionality which allows someone viewing a report to jump to a particular section.  For example, in the Customer Orders report presented below, the HTML spans seven pages.  The TOC is displayed in a collapsible frame to the left of the report and represents a hierarchy of content for the entire report.  Selecting any entry in the TOC automatically loads the desired page.  TOC entries can be nested, as the Order Number is nested below the Customer Number in the example below.</p>
+<p>The TOC is formatted with the standard BIRT Expression Builder.</p>
+<img src="images/toc.jpg" width="768" height="576"/>
+<p>The Viewer also supports data extraction to CSV format.  This is accomplished by clicking the "Export Data" icon located on the toolbar.</p>
+<img src="images/export1.jpg" width="768" height="576"/>
+<p>A dialog is presented allowing the user to select the columns to export to CSV.</p>
+<img src="images/export3a.png" width="370" height="408"/>
+
+<h1>JavaScript/Java Events And Report Debugging</h1>
+<p>BIRT currently supports event scripting using JavaScript.  Event handlers are coded in the BIRT Script Editor, which now supports syntax color-coding and code completion.  The Editor also offers improved access to report item properties.</p>
+<img src="images/ScriptEditor.jpg" width="768" height="576"/>
+<p>BIRT 2.0 has extended the script model to allow coding of event handlers in Java as well as JavaScript.  This feature gives the Java developer greater flexibility when building complex reports.  An additional benefit of coding in Java is the ability to debug the events using the new BIRT Report Launch Configuration under the Java Development Tools (JDT).</p>
+<p>To create a Java event the developer first builds the event Class in Java.</p>
+<img src="images/javaevent1.jpg" width="768" height="576"/>
+<p>Next the Class is assigned to the Event Handler Property for the given Report Item.  In the case illustrated below, the Java Event Handler Class is assigned to a table row.</p>
+<img src="images/javaevent2.jpg" width="768" height="576"/>
+<p>The Report can now be debugged within the JDT.</p>
+<img src="images/javaevent3.jpg" width="768" height="576"/>
+
+
+<h1>Runtime Data Source Property Binding</h1>
+<p>It is often desirable to use one set of credentials for developing a report and separate set(s) for production usage.  BIRT 2.0 accomplishes this using a Data Source Property Binding Wizard, which allows several properties for the data source to be changed at runtime.  For example, the report below uses the Username and Password parameters that are passed to it to connect to the data source.</p>
+<img src="images/Datasource1.jpg" width="768" height="576"/>
+<p>The values used in the wizard can be more than simple parameters, including complex statements built using the Expression Builder.  For example assume we wish to use a test database while in development and a production database when the report is complete.  This can be accomplished by swapping the JDBC Driver URL at run time as shown below.</p>
+<img src="images/PropertyBinding.jpg" width="768" height="576"/>
+
+
+
+
+
+
+<h1>Chart Builder and SVG Output</h1>
+<p>A new chart builder is available in BIRT 2.0.  This wizard is designed to expedite chart development by separating the process into three easy to use dialogs: Select Chart Type, Select Data, and Format Chart.  SVG rendering of charts has also been added.</p>
+<img src="images/chart1a.jpg" width="768" height="576"/>
+<p><i>Select Chart Type.</i></p>
+<img src="images/chart2a.jpg" width="591" height="573"/>
+<p><i><c>Select Chart Data.</c></i></p>
+<img src="images/chart3a.jpg" width="504" height="497"/>
+<p><i>Format Chart.</i></p><br>
+<p>Additional functionality has been added to the Chart wizard to enhance support for user interactivity.  As shown below, additional events and actions have been added to support such things as scripting and drill-through.</p>
+<img src="images/interactcol.jpg" width="627" height="503"/>
+
+<h1>Templates</h1>
+<p>BIRT now provides report developers the ability to build and publish report templates.  Consistent look and feel can be difficult to achieve and maintain when building report applications. In addition, productivity and adoption by a broader range of report developers can be fostered by providing a pre-built report elements. Templates address these concerns and can range from skeletal outlines with predefined themes to complete reports.</p>
+<p>Building a BIRT report template is very similar to building a standard BIRT report.  One notable difference is that items within the report can be converted to template report items, which allow the template creator to set up indications where template user input is required.</p>
+<img src="images/TemplateItem.jpg" width="768" height="576"/>
+<img src="images/TemplateItemDetail.jpg" width="595" height="210"/>
+<p><i>Enter Prompts for Template Users.</i></p><br>
+<p>A new Template Publishing wizard has also been added.  The location of the template directory is configurable.</p>
+<img src="images/TemplatePublish.jpg" width="768" height="576"/>
+<p><i>Publish Wizard.</i></p><br>
+<p>The Template wizard allows the designer to populate a display name, description and image file.  The template is now available to use.</p>
+<img src="images/TemplateUsage.jpg" width="768" height="576"/>
+<p><i>Using a newly Created Template.</i></p><br>
+
+
+<h1>Libraries</h1>
+<p>BIRT 2.0 introduces the concept of libraries to BIRT.  With this feature, commonly used functions and report items can be encapsulated within a library.  These libraries can then be imported into any number of reports for reuse.  For example, a BIRT developer may wish to build a complex scripted data source and then encapsulate it within a BIRT library, freeing other members of the reporting team from implementing the same code.</p>
+<img src="images/lib3a.jpg" width="768" height="576"/>
+<p><i>Building a library.</i></p><br>
+<p>A new project item type is now available for library creation.  By dragging items from the palette to the Report Items node within the library Outline, the report developer can customize these components for reuse.  Data Sources and Sets, Report Parameters, Report Items, Themes, Master Pages and Images can be added to the library.</p>
+<p>After the library is created, it can be shared with report developers, who can import the library into their own designs.</p>
+<img src="images/lib5a.jpg" width="768" height="576"/>
+<p><i>Using a library.</i></p><br>
+<p>The BIRT team has also added a new view to the BIRT perspective for browsing and importing the available libraries.  Existing libraries within the workspace automatically show up in the Library Explorer. (In this screenshot, the Explorer has been pinned to the left side with the Palette and Data Explorer.)</p>
+<p>Using a library is as easy as importing it and then dragging the desired items to required report location.</p>
+<p>Reports that reference libraries automatically update when executed.  This is very useful in cases where business or technical changes require report rework. For example, imagine that a database schema changes or the company logo is altered.  If these details are encapsulated in libraries, only the library would need to change and all referencing reports would be automatically updated to reflect the changes.</p>
+
+<h1>XML ODA</h1>
+<p>Building on the existing drivers that BIRT already supplies, BIRT 2.0 delivers an XML ODA for retrieving XML data.  The data can be streamed or reside within a file.  This driver uses XPath syntax for XML to relational data mapping.</p>
+<img src="images/xml2.jpg" width="800" height="522"/>
+<p><i>Use XPath expression to map an XML node to a row.</i></p><br>
+<img src="images/xml3.jpg" width="800" height="522"/>
+<p><i>Use XPath syntax to map node and attribute values to columns.</i></p><br>
+
+
+<h1>URL Builder</h1>
+<p>BIRT 2.0 offers a new URL Builder to quickly support summary to detail Drill-through linking as well as standard Bookmark and URL creation.</p>
+<img src="images/url3a.jpg" width="768" height="576"/>
+<p><i>Define the URL.</i></p><br>
+<img src="images/url2a.jpg" width="768" height="576"/>
+<p><i>Drill-through Illustration.</i></p><br>
+
+<h1>Multi-pass Aggregate, Sorting and Filtering</h1>
+<p>Several improvements have been added to support advanced aggregate, filtering and sorting of report data.  For example, computed columns can now use aggregate functions.</p>
+<img src="images/aggr1a.jpg" width="768" height="576"/>
+<p><i>Computed column with aggregation.</i></p><br>
+<p>In addition, the group dialog now supports adding multiple sorting and filtering expressions. </p>
+<img src="images/aggr2a.jpg" width="768" height="576"/>
+<p><i>New Filtering and Sorting tabs.</i></p><br>
+
+
+<h1>Improved Report Performance and PDF Fidelity</h1>
+<p>BIRT 2.0 includes an enhanced data engine with the ability to process large data sets via a combination of memory and disk cache. The BIRT team has done tests that show that the engine can now handle reports of well over a million rows with linear response time and bounded memory usage.  BIRT has also incorporated the iText PDF library to improve PDF generation fidelity.</p>
+
+
+<h1>Dynamic Parameters/Cascading Parameters</h1>
+<p>Most applications, which require reporting, will have a need for culling or filtering the data that is used within the report.  This allows tailoring the report to a specific user without the need to highly customize the report design.  This is often done with report parameters that are used within the report logic and/or the SQL query.  The issue, then, becomes how to present and collect the parameter information from the consumer of the report.  BIRT 2.0 addresses this issue by adding sophisticated dynamic and cascading parameter support.</p>
+<p>With the new Dynamic Parameter feature, the report designer can present the consumer a list of options for a parameter that is interactive and based on live content.</p>
+<img src="images/dynp1b.JPG" width="602" height="576"/>
+<p>In the above example, a Dynamic Parameter is created that presents the report user with a list of Countries to choose from.  This is achieved, by allowing the report designer the ability to create a BIRT data set, which can then be used to dynamically populate a parameter list box.</p>
+<img src="images/dynp2b.JPG" width="603" height="564"/>
+<p>In addition to Dynamic Parameters, it is often desirable to present the user a set of interlinked parameter choices.  For example, a user wishes to run a report that displays all of his/her employees that work in the Pasadena office.  You would not want to display a list of all possible employee cities.  Ideally a Country list would be displayed, and then possibly a State/Province, followed finally by a City list.  BIRT 2.0 accomplishes this by delivering a Cascading Parameter Feature.</p>
+<img src="images/dynp3a.JPG" width="605" height="631"/>
+<p>The Cascaded parameter list provides nested selection. In the above example, the Customer’s Country is selected and this choice restricts the Customer’s City choices.  As with Dynamic Parameters, the choices are based on a BIRT Data Set.</p>
+<img src="images/dynp4a.JPG" width="603" height="609"/>
+
+
+<h1>Expression Builder</h1>
+<p>The Expression Builder has been replaced with an improved GUI, which presents a more streamlined and intuitive interface for building JavaScript expressions. The new Expression builder includes features like line numbers, cut and paste functionality, object browsing and tool tips.</p>
+<img src="images/express1.JPG" width="602" height="545"/>
+
+<h1>Importing of Style Sheets</h1>
+<p>While Style Sheets offer a wide range of formatting and design features, with earlier versions of BIRT, styles had to be defined individually within the report design.  To overcome this limitation, BIRT 2.0 delivers the capability to import Style Sheets into the report design, from an external source.</p>
+<img src="images/importcss.JPG" width="601" height="453"/>
+<p>Using this feature, it is now easier to present a consistent look and feel across multiple report designs without having to create separate style instances for each. In addition, the feature makes it possible to easily coordinate report look and with web site look and feel, which can be particularly important when BIRT reports are included in extranets and web portals.</p>
+
+<h1>Report XML Editor</h1>
+<p>Expanding on the capabilities of the Report Designer, a new XML source editor tab is now available to the report designer.  The Source tab presents the entire report design in color-coded XML format, allowing direct modifications the XML design that are persisted immediately.</p>
+<img src="images/xmleditor.JPG" width="798" height="598"/>
+
+<h1>Passing of External Object to Custom Data Sources</h1>
+<p>Often the BIRT engine is embedded in or is part of an existing J2EE application.  The ODA layer, which is responsible for data access, occasionally needs access to objects in the Context of the encapsulating application.  This might include things like security credentials, connection handles, or parameter objects.  To accommodate this requirement, BIRT 2.0 has added a Context Object within the ODA layer, which can be passed in from the external application.  This object can take many forms and can be used for all of the items mentioned above.</p>
+
+<h1>Stored Procedures</h1>
+<p>BIRT now supports calling stored procedures.  Within the Data Set Editor, the stored procedures are now displayed and can be used to build complex Data Sets.</p>
+<img src="images/StoredProcs.JPG" width="603" height="547"/>
+<p>In the above example, "OrdersByProducts" is being called to return a quantity of products sold, based on Product Name, which is passed as a parameter to the stored procedure. </p>
+
+<h1>CLOB/BLOB  Support</h1>
+<p>The Data Set data types have been expanded to include Character Large Object (CLOB) and Binary Large Object (BLOB) items.  In addition to adding support for these types within the ODA framework, these items can now be bound to certain controls within the designer.  CLOB columns can be bound to Text controls and BLOB columns can be bound to Image controls.</p>
+<img src="images/blobtype.JPG" width="603" height="457"/>
+<p>In the example above, the logo image is stored as a BLOB type.  The Image Builder has been enhanced to allow the BLOB image to be retrieved from the database and inserted into an Image control.</p>
+
+
+
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/project/notable2.0M2.html b/project/notable2.0M2.html
new file mode 100644
index 0000000..a78582d
--- /dev/null
+++ b/project/notable2.0M2.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>New and Notable Features within BIRT 2.0 Milestone 2</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Project</p>
+<p class="subhead">New and Notable BIRT 2.0 M2</p>
+
+<h1>General</h1>
+<p>The BIRT team has been hard at work developing BIRT 2.0, which is slated for release late this year and has reached a major milestone.  Milestone 2 has officially been released to the public.  Below is a description of some of the key features that are now available in the M2 build.  Keep in mind, as with all milestone releases, the product continues to evolve.   
+The complete list of features for the final 2.0 release is available at http://www.eclipse.org/birt/index.php?page=project/project_plan_R2_0_0.html.
+</p>
+
+<h1>Dynamic Parameters/Cascading Parameters</h1>
+<p>Most applications, which require reporting will have a need for culling or filtering the data that is used within the report.  This allows tailoring the report to a specific user without the need to highly customize the report design.  This is often done with report parameters that are used within the report logic and/or the SQL query.  The issue, then, becomes how to present and collect the parameter information from the consumer of the report.  BIRT 2.0 addresses this issue by adding sophisticated dynamic and cascading parameter support.
+With the new Dynamic Parameter feature, the report designer can present the consumer a list of options for a parameter that is interactive and based on live content.
+</p>
+<img src="images/dynp1b.JPG" width="602" height="576"/>
+<p>In the above example, a Dynamic Parameter is created that presents the report user with a list of Countries to choose from.  This is done, by allowing the report designer the ability to create a BIRT data set, which can then be used to dynamically populate a parameter list box. </p>
+<img src="images/dynp2b.JPG" width="603" height="564"/>
+<p>In addition to Dynamic Parameters, it is often desirable to present the user a set of interlinked parameter choices.  For example, a user wishes to run a report that displays all of his/her employees that work in the Pasadena office.  You would not want to display a list of all possible employee cities.  Ideally a Country list would be displayed, and then possibly a State/Province, followed finally by a City list.  BIRT 2.0 accomplishes this by delivering a Cascading Parameter Feature.</p>
+<img src="images/dynp3a.JPG" width="605" height="631"/>
+<p>The Cascaded parameter list provides nested selection. In the above example, the Customer’s Country is selected and this choice restricts the Customer’s City choices.  As with Dynamic Parameters, the choices are based on a BIRT Data Set.
+There are some known limitations with Dynamic and Cascading parameters in the M2 release. These will be corrected in future nightly and stable builds.
+</p>
+<img src="images/dynp4a.JPG" width="603" height="609"/>
+<h1>Expression Builder</h1>
+<p>The Expression Builder has been replaced with an improved GUI, which presents a more streamlined and intuitive interface for building JavaScript expressions. The new Expression builder includes features like line numbers, cut and paste functionality, object browsing and tool tips.  Additional changes continue to be made to the expression builder, including auto complete and syntax highlighting, which are slated for the final 2.0 release.</p>
+<img src="images/express1.JPG" width="602" height="545"/>
+<h1>Importing of Style Sheets</h1>
+<p>While Style Sheets offer a wide range of formatting and design features, with earlier versions of BIRT, styles had to be defined individually within the report design.  To overcome this limitation, BIRT 2.0 delivers the capability to import Style Sheets into the report design, from an external source.</p>
+<img src="images/importcss.JPG" width="601" height="453"/>
+<p>Using this feature, it is now easier to present a consistent look and feel across multiple report designs without having to create separate style instances for each. In addition, the feature makes it possible to easily coordinate report look and with web site look and feel, which can be particularly important when BIRT reports are included in extranets and web portals.
+This feature will continue to be refined and will be encapsulated within the Library functionality that is still in development for the BIRT 2.0 release.
+</p>
+<h1>Report XML Editor</h1>
+<p>Expanding on the capabilities of the Report Designer, a new XML source editor tab is now available to the report designer.  The Source tab presents the entire report design in color-coded XML format, allowing direct modifications the XML design that are persisted immediately.</p>
+<img src="images/xmleditor.JPG" width="798" height="598"/>
+<h1>Passing of External Object to Custom Data Sources</h1>
+<p>Often the BIRT engine is embedded in or is part of an existing J2EE application.  The ODA layer, which is responsible for data access, occasionally needs access to objects in the Context of the encapsulating application.  This might include things like security credentials, connection handles, or parameter objects.  To accommodate this requirement, BIRT 2.0 has added a Context Object within the ODA layer, which can be passed in from the external application.  This object can take many forms and can be used for all of the items mentioned above.</p>
+<h1>Stored Procedures</h1>
+<p>With the release of M2, BIRT now supports calling stored procedures.  Within the Data Set Editor, the stored procedures are now displayed and can be used to build complex Data Sets.</p>
+<img src="images/StoredProcs.JPG" width="603" height="547"/>
+<p>In the above example, “OrdersByProducts” is being called to return a quantity of products sold, based on Product Name, which is passed as a parameter to the stored procedure.</p>
+<h1>CLOB/BLOB  Support</h1>
+<p>The Data Set data types have been expanded to include Character Large Object (CLOB) and Binary Large Object (BLOB) items.  In addition to adding support for these types within the ODA framework, these items can now be bound to certain controls within the designer.  CLOB columns can be bound to Text controls and BLOB columns can be bound to Image controls.</p>
+<img src="images/blobtype.JPG" width="603" height="457"/>
+<p>In the example above, the logo image is stored as a BLOB type.  The Image Builder has been enhanced to allow the BLOB image to be retrieved from the database and inserted into an Image control.</p>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/project/notable2.0M3.html b/project/notable2.0M3.html
new file mode 100644
index 0000000..1b9dced
--- /dev/null
+++ b/project/notable2.0M3.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 transitional//EN">
+<html>
+
+<head>
+<title>New and Notable Features within BIRT 2.0 Milestone 3</title>
+<link rel="stylesheet" href="../style/compose.css" type="text/css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+
+<p class="head">BIRT Project</p>
+<p class="subhead">New and Notable BIRT 2.0 M3</p>
+
+<h1>General</h1>
+<p>The BIRT team moves closer to the final 2.0 release this week by completing Milestone 3.<br><br>
+This Milestone has quite a list of improvements, some of which—like templates and libraries—can help Java report developers improve their productivity and help foster reuse within (and across) organizations. Others, such as the improvements to BIRT’s charting, both extend the functionality available and improve its usability. <br><br>
+As with all milestone releases, keep in mind that the product will continue to evolve.<br>
+The complete list of features for the final 2.0 release is available <a href=http://www.eclipse.org/birt/index.php?page=project/project_plan_R2_0_0.html>here</a>.
+</p>
+
+<h1>Chart Builder and SVG Output</h1>
+<p>A new chart builder is available in M3.  This wizard is designed to expedite chart development by separating the process into three easy to use dialogs: Select Chart Type, Select Data, and Format Chart.  SVG rendering of charts has also been added.</p>
+<img src="images/chart1a.jpg" width="768" height="576"/>
+<p><i>Select Chart Type.</i></p>
+<img src="images/chart2a.jpg" width="591" height="573"/>
+<p><i><c>Select Chart Data.</c></i></p>
+<img src="images/chart3a.jpg" width="504" height="497"/>
+<p><i>Format Chart.</i></p><br>
+<p>Additional functionality has been added to the Chart wizard to enhance support for user interactivity.  As shown below additional events and actions have been added to support such things as scripting and drill-through.</p>
+<img src="images/interactcol.jpg" width="627" height="503"/>
+<h1>Templates</h1>
+<p>BIRT now provides report developers the ability to build and publish report templates.  Consistent look and feel can be difficult to achieve and maintain when building report applications. In addition, productivity and adoption by a broader range of report developers can be fostered by providing a pre-built report elements. Templates address these concerns and can range from skeletal outlines with predefined themes to complete reports.</p>
+<br>
+<p>Building a BIRT report template is very similar to building a standard BIRT report.  One notable difference is that items within the report can be converted to template report items, which allow the template creator to set up indications where template user input is required.</p>
+<img src="images/templ2a.jpg" width="768" height="576"/>
+<img src="images/templsnippet.jpg" width="590" height="202"/>
+<p><i>Enter Prompts for Template Users.</i></p><br>
+<p>The BIRT team has added a Template Publishing wizard to quickly put the template to use.</p>
+<img src="images/templ4a.jpg" width="768" height="576"/>
+<p><i>Publish Wizard.</i></p><br>
+<p>The Template wizard allows the designer to populate a display name, description and image file.  After publishing, the template is available to use within the new report wizard.</p>
+<img src="images/templ5a.jpg" width="768" height="576"/>
+<p><i>Using a newly Created Template.</i></p><br>
+<h1>Libraries</h1>
+<p>Milestone 3 introduces the concept of libraries to BIRT.  With this feature, commonly used functions and report items can be encapsulated within a library.  These libraries can then be imported into any number of reports for reuse.  For example, a BIRT developer may wish to build a complex scripted data source and then encapsulate it within a BIRT library, freeing other members of the reporting team from implementing the same code.</p>
+<img src="images/lib3a.jpg" width="768" height="576"/>
+<p><i>Building a library.</i></p><br>
+<p>A new project item type is now available for library creation.  By dragging items from the palette to the Report Items node within the library Outline, the report developer can customize these components for reuse.  Data Sources and Sets, Report Parameters, Report Items, Themes, Master Pages and Images can be added to the library.</p>
+<br>
+<p>After the library is created, it can be shared with report developers, who can import the library into their own designs.</p>
+<img src="images/lib5a.jpg" width="768" height="576"/>
+<p><i>Using a library.</i></p><br>
+<p>The BIRT team has also added a new view to the BIRT perspective for browsing and importing the available libraries.  Existing libraries within the workspace automatically show up in the Library Explorer. (In this screenshot, the Explorer has been pinned to the left side with the Palette and Data Explorer.)
+Using a library is as easy as importing it and then dragging the desired items to required report location.
+</p>
+<br>
+<p>Reports that reference libraries automatically update when executed.  This is very useful in cases where business or technical changes require report rework. For example, imagine that a database schema changes or the company logo is altered.  If these details are encapsulated in libraries, only the library would need to change and all referencing reports would be automatically updated to reflect the changes.</p>
+<h1>XML ODA</h1>
+<p>Building on the existing drivers that BIRT supplies, M3 delivers an XML ODA for retrieving XML data.  The data can be streamed or reside within a file.  This driver uses XPath syntax for XML to relational data mapping.</p>
+<img src="images/xml2.jpg" width="800" height="522"/>
+<p><i>Use XPath expression to map an XML node to a row.</i></p><br>
+<img src="images/xml3.jpg" width="800" height="522"/>
+<p><i>Use XPath syntax to map node and attribute values to columns.</i></p><br>
+<h1>URL Builder</h1>
+<p>M3 offers a new URL Builder to quickly support summary to detail Drill-through linking as well as standard Bookmark and URL creation.</p>
+<img src="images/url3a.jpg" width="768" height="576"/>
+<p><i>Define the URL.</i></p><br>
+<img src="images/url2a.jpg" width="768" height="576"/>
+<p><i>Drill-through Illustration.</i></p><br>
+<h1>Multi-pass Aggregate, Sorting and Filtering</h1>
+<p>Several improvements have been added to support advanced aggregate, filtering and sorting of report data.  For example, computed columns can now use aggregate functions.</p>
+<img src="images/aggr1a.jpg" width="768" height="576"/>
+<p><i>Computed column with aggregation.</i></p><br>
+<p>In addition, the group dialog now supports adding multiple sorting and filtering expressions.</p>
+<img src="images/aggr2a.jpg" width="768" height="576"/>
+<p><i>New Filtering and Sorting tabs.</i></p><br>
+<h1>Improved PDF and Report Performance</h1>
+<p>M3 includes an enhanced data engine with the ability to process large data sets via a combination of memory and disk cache. The BIRT team has done tests that show that the engine can now handle reports of well over a million rows with linear response time and bounded memory usage.
+<br>BIRT has also incorporated the iText PDF library to improve PDF generation performance.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/project/pmc.html b/project/pmc.html
index 39aab4f..6dc3633 100644
--- a/project/pmc.html
+++ b/project/pmc.html
@@ -27,7 +27,20 @@
   applications. Paul is currently responsible for coordinating overall product 
   direction and vision for Actuate. He is also a member of the Eclipse 
   Planning and Requirements Councils.</dd>
-  
+
+<dt><i>Michael Fox, IBM / Rational</i></dt> 
+<dd>Mike has over 20 years experience with software product development
+and software project management. Mike has been responsible for developing 
+reporting solutions for several companies. He is now the Technical Lead and 
+Architect for the reporting components of IBM/Rational's Team Products, and 
+involved with reporting work in other parts of IBM Software Group. 
+</dd>
+
+<dt><i>Scott Rosenbaum, Innovent Solutions</i></dt>
+<dd>Scott has been providing professional services consulting in the business 
+  intelligence space for more than seven years and has been involved in software 
+  development for more than 15.</dd>
+
 <dt><i>Jason Weathersby, Actuate</i></dt>
 <dd>Jason has 15 years experience in the software development and consulting fields,
 with in-depth experience in identifying and addressing customer's 
@@ -36,10 +49,7 @@
 Open Source community. 
 </dd>
 
-<dt><i>Scott Rosenbaum, Innovent Solutions</i></dt>
-<dd>Scott has been providing professional services consulting in the business 
-  intelligence space for more than seven years and has been involved in software 
-  development for more than 15.</dd>
+
 </dl>
 
 <h1>Project Leaders</h1>
diff --git a/project/project_plan_R2_0_0.html b/project/project_plan_R2_0_0.html
new file mode 100644
index 0000000..7184540
--- /dev/null
+++ b/project/project_plan_R2_0_0.html
@@ -0,0 +1,776 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+
+<html>
+<head>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<meta name="Author" content="Eclipse BIRT Project PMC">
+<title>Eclipse BIRT Project - DRAFT 2.0 Plan</title>
+
+</head>
+
+<body>
+
+<p class="head">BIRT Project  2.0 Plan</p>
+<p class="subhead">Last revised 9 December, 2005 <br>
+<img src="/birt/project/new.gif" alt="New since last update" width="12" height="12"> marks interesting changes since the previous draft of 28 September, 2005</p>
+<h2><a name="Introduction"></a>Introduction</h2><p>
+This document lays out the feature and API set for the next feature release of the Eclipse BIRT project after 1.0.1, designated release 2.0.
+<ul>
+  <li><a href="#Deliverables">Release deliverables</a></li>
+  <li><a href="#Milestones">Release milestones</a></li>
+  <li><a href="#TargetOperatingEnvironments">Target operating
+  environments</a></li>
+  <li><a href="#Compatibility">Compatibility with previous releases</a></li>
+  <li><a href="#Themes">Themes</a></li>
+  <li><a href="#Projects">Projects</a></li>
+  <li><a href="#Defects">Defects</a></li>
+</ul>
+
+<p>
+Plans do not materialize out of nowhere, nor are they entirely static. To ensure 
+the planning process is transparent and open to the entire Eclipse community, plans 
+are posted in an embryonic form and then revised from time to time throughout the 
+release cycle. 
+</p>
+
+<p>
+The first part of the plan deals with the important matters of release deliverables, 
+release milestones, target operating environments, and release-to-release compatibility. 
+These are all things that need to be clear for any release, even if no features were 
+to change.
+</p>
+
+<p>
+The remainder of the plan consists of plan items for the projects under the Eclipse 
+BIRT project. Each plan item covers a feature or API that is to be added, or some aspect 
+that is to be improved. Each plan item has its own entry in the Eclipse bugzilla 
+database, with a title and a concise summary (usually a single paragraph) that explains 
+the work item at a suitably high enough level so that everyone can readily understand 
+what the work item is without having to understand the nitty-gritty detail.
+</p>
+
+<p>
+Please send comments about this draft plan to the <a href="mailto:birt-dev@eclipse.org">BIRT 
+Developer</a> mailing list.
+</p>
+
+<h2><a name="Deliverables"></a>Release deliverables</h2>
+
+<p>The release deliverables are:</p>
+<ul>
+  <li>Source code release for Eclipse BIRT, available as versions tagged &quot;R2.0&quot; in 
+the eclipse.org <a href="http://dev.eclipse.org/viewcvs">CVS repository</a>.</li>
+  <li>Eclipse BIRT Report Framework 2.0.</li>
+  <li>Eclipse BIRT RCP Report Designer 2.0.</li>
+  <li>Eclipse BIRT Runtime 2.0</li>
+  <li>Eclipse BIRT Charts 2.0</li>
+  <li>Eclipse BIRT Test Suites 2.0</li>
+</ul>
+
+<h2><a name="Milestones"></a>Release milestones</h2>
+<p>
+The Eclipse BIRT 2.0 release is targeted for release on December 30th 2005, 
+pending community release review. All release deliverables will be available 
+for download as soon as the release has been tested and validated in the 
+target operating configurations listed below.
+</p>
+
+<p>Release milestones:</p>
+<ul>
+  <li>Friday, September 16, 2005 BIRT 2.0 M1</li>
+  <li>Monday, October 24, 2005 BIRT 2.0 M2</li>
+  <li>Monday, November 21, 2005 BIRT 2.0 M3</li>
+  <li>Friday, December 30, 2005 BIRT 2.0 Release Candidate </li>
+  <li>Friday, January 20, 2006 BIRT 2.0</li>
+</ul>
+
+<p>
+For information about new features assigned to each milestone please refer to the 
+<a href="https://bugs.eclipse.org/bugs">bugzilla database</a>. The bugzilla database 
+will be updated on an ongoing basis as the plan progresses.
+</p>
+
+<h2><a name="TargetOperatingEnvironments"></a>Target Operating
+Environments</h2>
+
+<p>In order to remain current, each release of an Eclipse project targets
+reasonably current versions of underlying operating environments and other
+Eclipse projects on which it depends. </p>
+
+<p>
+Most of Eclipse, and all of BIRT, is &#8220;pure&#8221; Java&#8482; code and has no direct 
+dependence on the underlying operating system. For BIRT, the chief dependence 
+is on the Eclipse Platform, Graphical Editor Framework (GEF), Modeling 
+Framework (EMF), and on the Java 2 Platform that runs it. 
+</p>
+
+<p>The Eclipse BIRT 2.0 release depends on the following compatibility stack:</p>
+<b>BIRT 2.0 Reference Stack for Eclipse 3.1</b>
+<ul>
+  <li>Java 2 platform Java Development Kit (JDK) 1.4.2</li>
+  <li>Eclipse Platform Runtime Binary 3.1</li>
+  <li>Graphical Editor Framework (GEF) Runtime 3.1</li>
+  <li>Eclipse Modeling Framework (EMF) 2.1.0</li>
+</ul>
+<p>
+The Eclipse Platform and BIRT run in a variety of operating environments. Testing 
+is focused on a handful of popular <span class="header">combinations of operating system and Java 2 
+Platform; these are our <em>reference platforms</em>. Eclipse BIRT undoubtedly runs fine in 
+many operating environments beyond the reference platforms we test. However, since 
+we do not systematically test them we cannot vouch for them. Problems encountered 
+when running Eclipse BIRT on non-reference platforms that cannot be recreated on any 
+reference platform will be given lower priority than problems with running Eclipse 
+BIRT on a reference platform.</span></p>
+
+<p>For BIRT 2.0, the project team plans to tests and validate the following reference 
+platforms:</p>
+
+<table border="1">
+  <tbody>
+    <tr bgcolor="#CCCCCC">
+      <th colspan="4">
+        <div align="center">
+        <b><font size="+1">Eclipse BIRT Report Framework 2.0 and Eclipse BIRT RCP 
+Report Designer 2.0 Reference Platforms</font></b></div>
+      </th>
+    </tr>
+    <tr>
+      <td width="205"><b>Operating system</b></td>
+      <td width="76"><b>Processor architecture</b></td>
+      <td width="59"><b>Window system</b></td>
+      <td width="453"><b>Java 2 Platform</b></td>
+    </tr>
+    <tr>
+      <td width="205">Microsoft Windows XP</td>
+      <td width="76">Intel x86</td>
+      <td width="59">Win32</td>
+      <td width="453">Sun Java 2 Standard Edition, version 1.4.2, version 5.0</td>
+    </tr>
+    <tr>
+      <td width="205">Microsoft Windows 2000</td>
+      <td width="76">Intel x86</td>
+      <td width="59">Win32</td>
+      <td width="453">Sun Java 2 Standard Edition, version 1.4.2, version 5.0</td>
+    </tr>
+    <tr>
+      <td width="205">Microsoft Windows Server 2003</td>
+      <td width="76">Intel x86</td>
+      <td width="59">Win32</td>
+      <td width="453">Sun Java 2 Standard Edition, version 1.4.2, version 5.0</td>
+    </tr>
+    <tr>
+      <td width="205">Red Hat Enterprise Linux WS 3.0</td>
+      <td width="76">Intel x86</td>
+      <td width="59">GTK</td>
+      <td width="453">Sun Java 2 Standard Edition, version 1.4.2</td>
+    </tr>
+  </tbody>
+</table>
+
+<br>
+<table border="1">
+  <tbody>
+    <tr bgcolor="#CCCCCC">
+      <th colspan="4">
+        <div align="center">
+        <b><font size="+1">Eclipse BIRT Runtime 2.0 and Eclipse BIRT Charts 2.0 
+Reference Platforms</font></b></div>
+      </th>
+    </tr>
+    <tr>
+      <td width="205"><b>Operating system</b></td>
+      <td width="76"><b>Processor architecture</b></td>
+      <td width="59"><b>Window system</b></td>
+      <td width="453"><b>Java 2 Platform</b></td>
+    </tr>
+    <tr>
+      <td width="205">Microsoft Windows XP</td>
+      <td width="76">Intel x86</td>
+      <td width="59">Win32*</td>
+      <td width="453">Sun Java 2 Standard Edition, version 1.4.2</td>
+    </tr>
+    <tr>
+      <td width="205">Microsoft Windows XP</td>
+      <td width="76">Intel x86</td>
+      <td width="59">Win32*</td>
+      <td width="453">IBM SDK 1.4.2</td>
+    </tr>
+    <tr>
+      <td width="205">Microsoft Windows Server 2003</td>
+      <td width="76">Intel x86</td>
+      <td width="59">Win32*</td>
+      <td width="453">Sun Java 2 Standard Edition, version 1.4.2</td>
+    </tr>
+    <tr>
+      <td width="205">Microsoft Windows Server 2003</td>
+      <td width="76">Intel x86</td>
+      <td width="59">Win32*</td>
+      <td width="453">IBM SDK 1.4.2</td>
+    </tr>
+    <tr>
+      <td width="205">Red Hat Enterprise Linux WS 3.0</td>
+      <td width="76">Intel x86</td>
+      <td width="59">GTK*</td>
+      <td width="453">Sun Java 2 Standard Edition, version 1.4.2, BlackDown SDK 1.4.2</td>
+    </tr>
+    <tr>
+      <td width="205">SUSE Linux Enterprise Server 9</td>
+      <td width="76">Intel x86</td>
+      <td width="59">YaST*</td>
+      <td width="453">Sun Java 2 Standard Edition, version 1.4.2, BlackDown SDK 1.4.2</td>
+    </tr>
+  </tbody>
+</table>
+*Window system only required when displaying charts within SWT or SWING windows.<br>
+<br>
+<table border="1">
+  <tbody>
+    <tr bgcolor="#CCCCCC">
+      <th colspan="1">
+        <div align="center">
+        <b><font size="+1">BIRT Application Server Reference Platform</font></b></div>
+      </th>
+    </tr>
+    <tr>
+      <td width="405">Apache Tomcat 4.1.x, 5.5.x</td>
+    </tr>
+    <tr>
+      <td width="405">JBoss AS 4.0.2</td>
+    </tr>
+  </tbody>
+</table>
+<br>
+<table border="1">
+  <tbody>
+    <tr bgcolor="#CCCCCC">
+      <th colspan="1">
+        <div align="center">
+        <b><font size="+1">BIRT JDBC Reference Platforms</font></b></div>
+      </th>
+    </tr>
+    <tr>
+      <td width="405">MySQL Connector/J 3.x JDBC driver</td>
+    </tr>
+    <tr>
+      <td width="405">Derby V5.1 JDBC driver</td>
+    </tr>
+  </tbody>
+</table>
+<br>
+<table border="1">
+  <tbody>
+    <tr bgcolor="#CCCCCC">
+      <th colspan="1">
+        <div align="center">
+        <b><font size="+1">BIRT Browsers and Viewers Reference Platforms </font></b></div>
+      </th>
+    </tr>
+    <tr>
+      <td width="405">Mozilla Firefox 1.0</td>
+    </tr>
+    <tr>
+      <td width="405">Microsoft Internet Explorer 6.0</td>
+    </tr>
+    <tr>
+      <td width="405">Adobe Acrobat Reader 7.0</td>
+    </tr>
+  </tbody>
+</table>
+<br>
+<h4>Internationalization</h4>
+<p>Eclipse is designed as the basis for internationalized products. The user 
+interface elements provided by the various Eclipse projects, including dialogs 
+and error messages, are externalized. The English strings for BIRT are provided 
+as the default resource bundles. Translations are provided with this release 
+for French (fr_FR), German (de_DE), Spanish (es_ES), Japanese (ja_JP), Simplified 
+Chinese (zh_CN), and Korean (ko_KR).
+</p>
+
+<h2><a name="Compatibility"></a>Compatibility with Previous Releases</h2>
+
+<p>BIRT 2.0 will be compatible with earlier versions of BIRT to the greatest 
+extent possible. The nature and scope of some of the key plan items for BIRT 
+2.0 are such that the only feasible solutions might break compatibility. In 
+other regards, BIRT 2.0 will be compatible with 1.0.1 and 1.0. We also aim to 
+minimize the effort required to port an existing plug-in to the 2.0 APIs.
+</p>
+
+<h3>Compatibility of Release 2.0 with 1.x</h3>
+
+<p>BIRT 2.0 will be compatible with BIRT 1.x unless noted. The detailed 
+compatibility statement is listed below. In this statement, &quot;BIRT&quot; refers to 
+all BIRT components: BIRT Report Framework, BIRT Runtime, and BIRT Chart SDK.
+</p>
+
+<p><b>API Contract Compatibility:</b> BIRT 2.0 will be upwards contract-compatible 
+with BIRT 1.x to the greatest extent possible. All incompatibility exceptions will 
+be documented. Downward contract compatibility is not supported. There is no guarantee 
+that compliance with BIRT 2.0 APIs will ensure compliance with BIRT 1.x APIs. Refer 
+to general Eclipse document on 
+<a href="http://eclipse.org/eclipse/development/java-api-evolution.html">Evolving 
+APIs</a> for a discussion of the kinds of API changes that maintain contract compatibility.</p>
+
+<p>The BIRT Chart UI API v2.0 is not compatible with the v1.0 API due to a full redesign 
+of the Chart UI. However, older extension implementations are expected to be used with 
+the new version as noted below &#8211;</p>
+
+<u>Support for Old Chart UI Extension Points</u><br>
+<em>&#8216;uisheets&#8217; Extension Point: </em>The &#8216;uisheets&#8217; extension point will be supported
+but in a slightly limited form. It will be used to populate the navigation tree in the 
+formatting task sheet only. All extensions will be displayed under a special &#8216;Custom 
+Properties&#8217; node of the tree. The structure of the nodes represented by the extensions 
+will be maintained.<br><br>
+<em>&#8216;types&#8217; Extension Point: </em>This extension point will be supported with some new 
+functionality added to the interface. If the existing extension is created by 
+implementing the interface, it will need to be modified to implement the additional methods. 
+If it extends the default implementation, no changes will be needed. It will still be 
+suggested that the new functionality be reviewed so that its relevance to each extension 
+can be examined.<br><br>
+<em>&#8216;changelisteners&#8217; Extension Point: </em>This extension point will NOT be supported. 
+The functionality that could be extended and controlled using this extension point will 
+not be available in the new User Interface.<br><br>
+<em>&#8216;seriescomposites&#8217; Extension Point: </em>This extension point will be supported and 
+will have the same use as it did in version 1.0 viz. to provide UI components to set 
+attribute and data properties for custom series types. The location and use of these 
+custom composites however will be a little different in the new UI. In this case, the 
+data composite will be used in the data screen to allow setting of the data definition 
+for the series components. The attribute composite will be used in the advanced popup 
+for the series.
+
+<p><b>Binary (plug-in) Compatibility:</b> The BIRT 2.0 plug-in framework will be upwards 
+binary-compatible with BIRT 1.x plug-ins to the greatest extent possible. Downward 
+plug-in compatibility is not supported. Plug-ins for BIRT 2.0 will not be usable in BIRT 
+1.x. Extension plug-ins for BIRT 1.x will be upwards binary-compatible with BIRT 2.0.</p>
+
+<p><b>Source Compatibility:</b> BIRT 2.0 will be upwards source-compatible with BIRT 1.x to 
+the greatest extent possible. This means that source files written to use BIRT 1.x APIs 
+will successfully compile and run against BIRT 2.0 APIs. Downward source compatibility is 
+not supported. If source files use new BIRT APIs, they will not be usable with an earlier 
+version of BIRT.
+</p>
+
+<p><b>Report Design Compatibility:</b>BIRT 2.0 will be upwards report design 
+compatible with BIRT 1.x unless noted. This means that reports created with BIRT 
+1.x can be successfully opened by BIRT 2.0 and upgraded to a 2.0 format.
+</p>
+
+<p><b>Non-compliant usage of API's: </b> All non-API methods and classes, and certainly 
+everything in a package with &quot;internal&quot; in its name, are considered implementation 
+details which may vary between operating environment and are subject to change without 
+notice. Client plug-ins that directly depend on anything other than what is specified in 
+the BIRT API are inherently unsupportable and receive no guarantees about compatibility 
+within a single release much less with an earlier releases.</p>
+
+<h2><a name="Themes">Themes</a></h2>
+
+<p>
+Continuing on the theme for BIRT 1.x, the BIRT project's overriding release 2.0 theme 
+remains extending the Eclipse platform to provide infrastructure and tools that allow 
+application developers to design, deploy, generate and view reports within their 
+applications. In this context, the BIRT project also adopts and supports key themes 
+within the overall Eclipse planning process.
+</p>
+
+<ul>
+  <li><b>Scaling Up - </b>BIRT 2.0 targets the needs of report developers who report on 
+         large datasets generating large report documents with thousands of pages. This 
+         release also provides the capability to store report documents persistently.</li>
+  <li><b>Design for Extensibility - </b>BIRT 2.0 extends the extension points in the BIRT 
+         framework by implementing additional extensions on the framework. Some examples 
+         include support for XML as an additional data source and support for templates.</li>
+  <li><b>Simple to Use - </b>BIRT 2.0 includes a number of enhancements in this area such as 
+         scripting using Java, enhanced charting wizard functionality, improvements to the 
+         expression builder, and ease of use enhancements to the ROM API. Additionally, BIRT 
+         2.0 continues to provide the RCP based report designer which is targeted at the report 
+         developer.</li>
+  <li><b>Appeal to a Broader Community - </b>BIRT 2.0 will broaden the appeal of BIRT by enabling 
+         additional applications of BIRT technology. This will be made possible by the availability 
+         of support for numerous additional types of reports.</li>
+</ul>
+
+<h2><a name="Projects">Projects</a></h2>
+
+<h4>Report Types, Layouts, and Controls</h4>
+
+<blockquote>
+  <p><b>Multi-pass Aggregate, Sorting and Filtering</b>
+Some queries require multiple passes over the data. For example, a report may wish to display a 
+listing of top deals. The entry in the report for each deal might show the size of the deal as a 
+percentage of the total sales for that quarter. Such &#8220;two-pass&#8221; aggregates require BIRT to make 
+one pass over the data to compute the total for the quarter, then a second pass to generate the 
+report. This multi-pass aggregation is not supported by all data sources. This project therefore 
+extends BIRT to provide support for multi-pass aggregates for all data sources. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS2">BPS 2</a>][Bugzilla 
+ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110640">110640</a>][Theme: Simple to 
+use, Appeal to a Broader Community]</p>
+
+  <p><b>Top N / Bottom N Report Layout</b>
+Top N / Bottom N reports display information that is typically sorted by an aggregated number, for 
+example, a report that lists the top 3 performing sales people. This project will provide 
+capabilities to easily create a Top N / Bottom N type report section. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS2">BPS 2</a>][Bugzilla ID: 
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110641">110641</a>][Theme: Simple to use]</p>
+
+  <p><b>Provide support for binding Blob/Clob data to report controls</b>
+Many database  schemas, such as those used for call center or customer support applications,  contain columns defined as character large objects (CLOBs). These fields  contain, for example, the variable length and free format text notes that the  call center representative takes when speaking to a customer. <img src="/birt/project/new.gif" alt="New since last update to plan" width="12" height="12">In addition, an  human resources system might store pictures of employees in a database as  binary large objects (BLOBS). This project will provide easy support for  displaying BLOBS/CLOBs in a BIRT report. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS3">BPS 3</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110642">110642</a>][Theme: Simple to use, Appeal to a Broader Community]</blockquote>
+
+<h4>BIRT Java Script Objects</h4>
+<blockquote>  
+
+<p>BIRT 1.0 included support for many of the scripting object capabilities that are in JavaScript. 
+This project is intended to add more scripting objects. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS4">BPS 4</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110644">110644</a>][Theme: Simple to use]
+
+</blockquote>
+
+<h4>Interactive Report Viewing</h4>
+
+<blockquote>
+  <p><b>Page-on-Demand Navigation</b>
+Page-on-demand is a mechanism for dealing efficiently with large report documents over a 
+remote connection such as to the internet. Instead of reading an entire report into memory 
+or sending an entire report over a network, pages are requested by the application and sent 
+as needed. This method of data transfer improves response time for the end user and optimizes 
+resource usage. When integrating BIRT into applications, particularly web applications, 
+page-on-demand capabilities are needed to ensure that the application can be built with 
+acceptable performance. 
+
+This feature consists of two projects:
+1) providing the application developer with page-on-demand viewing API&#8217;s. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS22">BPS 22</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110645">110645</a>]
+2) including an exemplary implementation of a viewing framework that allows application 
+developers to easily integrate viewing functionality into their applications and customize 
+the viewing capabilities they choose. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS5">BPS 5</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110646">110646</a>]
+[Theme: Scaling up]
+
+
+<p><b>Report Paging</b>
+Long reports need to be divided into pages for effective use. This division can occur either 
+automatically, or with specific page breaks determined by the report developer. Multi-page 
+report support will allow the report developer to design reports that have controlled page 
+breaks (such as for each new group value), or using automatic page breaks, and for the 
+application developer to integrate page navigation of BIRT reports into the application itself. 
+The definition of a page in this context needs to be flexible to accommodate differing physical 
+characteristics, or logical constructs such as a page for each customer. This project enables 
+BIRT to support multi-page report output. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS19">BPS 19</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110671">110671</a>]
+[Theme: Scaling up]
+<p><b>Hyperlinks to Other Reports</b>
+This project provides the report developer the capability to link easily to another report while 
+not hard wiring the report to a particular environment. Additionally, if a user navigates to 
+another report, it also provides the mechanisms to retain the state of the original report. 
+[<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS5">BPS 5</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110648">110648</a>]
+[Theme: Simple to use]
+
+<p><b>Bookmarks (Hyperlinks into a Report Body)</b>
+It is often desirable to hyperlink into a specific point in a report document, for example, to 
+a chart that has sales summaries for the Western Region. Many report items can be the target of 
+hyperlinks. The BIRT bookmark feature is a string that uniquely identifies the item instance 
+within the report. This project provides support for the bookmark concept in BIRT reports. 
+[<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS5">BPS 5</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110651">110651</a>]
+[Theme: Simple to use]
+
+<p><b>Table of Contents Support in Viewer</b>
+A table of contents shows the hierarchical structure of a report to the end user and allows 
+the user to easily and quickly navigate to sections of the report. The hierarchy is defined by 
+the report grouping and sub report structure, with customizations possible by the report developer, 
+such as providing custom text for each node in the hierarchy. TOC features include: ability to 
+expand the TOC one level at a time, handle arbitrarily large groups at any node/level in the 
+hierarchy, and links from the group title jump to the first page of that group. Note that this 
+project is focused on TOC as a navigational mechanism in the report viewer, rather than providing a 
+TOC element that can be embedded in a report. This later item is a separate feature that is not 
+scheduled for this release. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS5">BPS 5</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110655">110655</a>]
+[Theme: Simple to use]
+</blockquote>
+
+<h4>Report Engine Scalability and Performance</h4>
+
+<blockquote>
+<p><b>Memory Usage Efficiency Improvement</b>
+This project intends to enhance the BIRT engine to utilize memory more efficiently. 
+[<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS6">BPS 6</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110656">110656</a>]
+[Theme: Scaling up]
+
+<p><b>Concurrent User Scalability Large Numbers of Active Users</b>
+When BIRT is deployed in a production environment with various kinds of application servers, it 
+is expected that there will be hundreds of users who concurrently need to run a BIRT report. 
+BIRT needs to be able to scale to handle running reports concurrently for large numbers of users. 
+[<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS6">BPS 6</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110658">110658</a>][Theme: Scaling up]
+
+</blockquote>
+
+<h4>Data Engine Scalability and Performance</h4>
+<blockquote>
+<p><b>Disk-Based Sorting and Data Manipulation</b>
+Reports against large data sets with millions of rows often require the report engine to sort the data and perform aggregation. To support these scenarios, this project incorporates a sorting and aggregation capability within the BIRT Engine, which, due to the potentially large data sets, can use a combination of memory and disk for the task. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS7">BPS 7</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110659">110659</a>]
+[Theme: Scaling up]
+
+<p><b>Cache Query Results while Developing</b>
+While designing a report, the developer specifies a data set to report on. If the number of 
+records in the data set is large, then the iterative process of making changes to a report 
+followed by previewing those changes slows down because the large data set has to be fetched 
+for each preview operation. This slowdown can hinder quick report design and adversely affect 
+the developer experience and productivity associated with BIRT. This project allows a report 
+developer to specify a property on a data set that limits the number of records that are 
+fetched during the development process, and that those results are cached as much as possible. 
+[<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS7">BPS 7</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110660">110660</a>][Theme: Simple to use]
+
+</blockquote>
+
+<h4>Report Document</h4>
+<blockquote>
+<p><b>Persistent Storage of Report Output</b>
+It is often desirable to run a report and then store the results of that report for viewing later. 
+For example, generating a large (1000s of pages) report and then viewing pages individually as 
+needed. To support this scenario, this project extends BIRT to offer a way to persistently save a 
+report for viewing at some point in the future. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS8">BPS 8</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110661">110661</a>][Theme: Scaling up]
+</blockquote>
+
+<h4><strong><img src="/birt/project/new.gif" alt="New since last update" width="12" height="12">Improved PDF Output  Generation </strong></h4>
+<blockquote>
+Robust PDF generation is a key component for reporting since many users generate PDF versions of the report for portability, printing and distribution. For BIRT, the PDF support needs to be very high quality. This project addresses issues related to PDF generation using FOP such as slow performance, limited support for lines and borders, and others. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS21">BPS 21</a>] [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=120143">120143</a>][Theme: Scaling up]
+</blockquote>
+
+<h4><strong>Report Template</strong></h4>
+<blockquote>
+When creating a new report, BIRT provides the ability to select a template for the report design. 
+With BIRT 1.0, these templates are from a predefined list that is built into the user interface. 
+In order to support context specific uses of BIRT, the application developer wants to be able to 
+add new templates into the user interface. In addition, BIRT will allow templates to be added to 
+the user interface, and for cheat sheets to be associated with the template. It will also be 
+possible to include associations to a style sheet and/or library with the template design. This 
+would allow the developer to provide the person consuming the template with pre-defined styles 
+and/or visual components from a library. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS9">BPS 9</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110662">110662</a>][Theme: Design for extensibility]
+
+</blockquote>
+
+<h4>BIRT Library</h4>
+<blockquote>
+Libraries contain report components or functions for reuse in multiple report designs. A report 
+or library developer creates a library, then places it in a shared location for others to use. 
+Libraries improve developer productivity and promote report design consistency, and maintainability. 
+This project will provide library support within BIRT. This includes simple components and compound 
+compounds such as a page header with a logo and address. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS10">BPS 10</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110663">110663</a>]
+[Theme: Simple to use]
+
+</blockquote>
+
+<h4>BIRT Style and CSS Style Sheet</h4>
+<blockquote>
+<p><b>External Style Sheets for Use Across Multiple Report Designs</b>
+This project extends the concept of styles to allow the definition of a style to be contained in a 
+separate style sheet file that can be shared across multiple reports. This will make it easy to 
+establish a common look across all the reports in an application, and if needed, to be able to 
+quickly change the look across many reports just by editing the style sheet. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS11">BPS 11</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110746">110746</a>]
+[Theme: Scaling up, Simple to use]
+
+<p><b>Ability to import CSS Style Sheets</b>
+When designing a report that is going to be deployed in a corporate application, the developer of 
+the report should not have to recreate the styles that have already been defined for the look and 
+feel of the web site. This project allows the BIRT report developer to &quot;point&quot; to an existing CSS 
+style sheet file and import this for use within their report design to define various elements of 
+the report such as fonts, colors, and others. A future project will look at using a CSS style sheet 
+directly without the need to import. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS11">BPS 11</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110664">110664</a>]
+[Theme: Simple to use]
+
+</blockquote>
+
+<h4>Code Editor for BIRT Scripting</h4>
+<blockquote>
+BIRT supports the ability to script, or code, the behavior of reports in a number of ways. To 
+improve code editing, BIRT will leverage an Eclipse perspective for working with code in BIRT. 
+Perspectives exploit the power of Eclipse to the report designer&#8217;s benefit.  In addition, they 
+are a way to provide rich functionality by leveraging the Eclipse environment. This project will 
+provide support for and a perspective for Java Code Editing for BIRT reports. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS12">BPS 12</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110665">110665</a>]
+[Theme: Simple to use]
+
+</blockquote>
+
+<h4>Dynamic Parameter Selection List</h4>
+<blockquote>
+Parameterized BIRT reports can be used to provide a highly personalized experience. End-users 
+can choose to view the information that matters most to them when they want to see it. Parameter 
+values change as quickly as the business itself. For example, a sales manager may want to view 
+total sales closed by a particular salesperson. In order to support the more complex scenario, 
+BIRT should allow report developers to specify that the list of values for a parameter be 
+dynamically populated at run time. The goal of this project is to provide built-in support for 
+dynamic parameters. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS14">BPS 14</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110666">110666</a>]
+[Theme: Simple to use]
+
+</blockquote>
+
+<h4><img src="/birt/project/new.gif" alt="New since last update" width="12" height="12">Cascading Dynamic Parameter Lists</h4>
+<blockquote>
+Parameterized BIRT reports can be used to provide a highly personalized experience. Building on the support for Dynamic Parameter Lists, a report may require an end user, at run time, to specify more than 1 parameter that are cascaded together. For example, a regional sales report may require the user to specify parameters for the State and City. Suppose the user selects California for the state. The user may then want to see the sales information for a specific city. The user would then specify a value for the City parameter of the report. However, the values for the City parameter list would depend on the value selected for the State parameter and would dynamically at run time be populated with cities in California. This project concerns itself with providing the report developer with the ability to define dynamic parameters that are cascaded together as described above. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS14">BPS 14</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=120145">120145</a>][Theme: Simple to use]
+
+</blockquote>
+<h4>Chart Builder and Wizard</h4>
+<blockquote>
+BIRT includes support for including charts within a report design. The goal for this project 
+is to improve the usability of the chart control. We will be looking at both a Wizard/Builder 
+approach for common usage/charts, in addition to a more advanced capability for report 
+developers who want to control the chart in more detail. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS15">BPS 15</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110667">110667</a>]
+[Theme: Simple to use]
+
+</blockquote>
+
+<h4>Property Editor for Chart Report Item</h4>
+<blockquote>
+BIRT provides a Property Editor for accessing commonly used properties for visual and 
+non-visual components in a report. The Property Editor is not currently available for elements 
+in a chart within a report design. For consistency and developer productivity reasons, this 
+project aims to allow the Property Editor to be used for commonly changed properties in a 
+chart. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS16">BPS 16</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110668">110668</a>]
+[Theme: Simple to use]
+</blockquote>
+
+<h4>Chart component improvements</h4>
+<blockquote>
+This project looks at the charting component of BIRT to make a number of significant improvements 
+in chart specification and generation. Examples of improvements to be made include, the ability 
+to use report styles in charts, handling the situation when labels on the X-axis overlap, 
+specifying a legend title, or marker shapes. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS17">BPS 17</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110669">110669</a>]
+[Theme: Simple to use]
+</blockquote>
+
+<h4>Scripting of Charts</h4>
+<blockquote>
+Some Report developers will want to customize the behavior of a chart in a report to meet 
+specific needs requested by their end users. For example, to highlight specific visual elements 
+in a chart based on data values such as expanding the pie slice for the median data value. This 
+project will provide the ability within BIRT to control the behavior of a chart with methods on 
+the chart control. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS18">BPS 18</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110670">110670</a>]
+[Theme: Simple to use]
+</blockquote>
+
+<h4>Expression  Builder</h4>
+<blockquote>
+With the Expression Builder in BIRT 1.0, it is awkward to build the expression using the user 
+interface. There are a number of improvements that can be made to make it easier to navigate 
+around the functions, and to provide the user with help on each of the functions that are 
+available. This project implements those usability improvements. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS20">BPS 20</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110672">110672</a>]
+[Theme: Simple to use]
+</blockquote>
+
+<h4><img src="/birt/project/new.gif" alt="New since last update" width="12" height="12">View/Edit XML Report Designs</h4>
+<blockquote>
+For developers working with report designs visually in the Layout View, it is useful to be able to see the XML associated with the report design they are working on. With BIRT 1.0, it is only possible to see the XML report design if you close the visual editor and open the design file in the Eclipse XML editor. In BIRT 1.0, it was not possible to easily switch between the visual and XML view. This project provides a mechanism for the report developer to easily switch between the visual and XML views of a report design, and to be able to edit the report in either view.[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=120923">120923</a>][Theme: Simple to use]
+</blockquote>
+
+<h4>XML Data Sources</h4>
+<blockquote>
+With the rapid adoption of XML as the lingua franca for business information exchange, and for 
+the exchange of information within an application, a large number of developers would like to 
+report against XML data sources. Additionally, most ERP and CRM applications now provide 
+interfaces to deliver data in XML. This project provides an out of the box adapter to access 
+XML data sources. This can be used &quot;as is&quot; or as an example ODA connector that can be adapted 
+for other purposes. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS23">BPS 23</a>]]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110673">110763</a>]
+[Theme: Simple to use, Appeal to a Broader Community]
+</blockquote>
+
+<h4>Dataset parameters</h4>
+<blockquote>
+Certain data sources, such as those accessing data in RDBMS's, support the concept of stored 
+procedures and functions. These constructs provide the capability to pass in parameters as well as 
+pass out resulting data values. This project concerns itself with building the capability to access 
+the output parameters from these types of constructs via BIRT scripting capability. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS24">BPS 24</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110765">110765</a>]
+[Theme: Simple to use, Appeal to a Broader Community]
+</blockquote>
+
+<h4>Report Object Model API</h4>
+<blockquote>
+The BIRT Design Engine API allows developers to programmatically manipulate a report design using 
+an API, rather than manipulating the XML directly. This API was introduced in BIRT 1.0 and is used 
+extensively within the BIRT project itself. This project makes some enhancements to the Design 
+Engine API based on feedback from the community and the BIRT project&#8217;s own use of the API. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS29">BPS 29</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110676">110676</a>]
+[Theme: Design for extensibility]
+</blockquote>
+
+<h4>ODA framework migration to DTP</h4>
+<blockquote>
+<p><b>Move ODA Runtime Extension Point and Java Interfaces to DTP</b> The ODA Runtime Extension Point 
+and Java Interface components will be part of the Eclipse Data Tools Project (DTP) going forward. 
+This BIRT project will move these components from the BIRT areas of Eclipse to DTP and make any 
+naming changes as needed. This includes reviewing and removing any BIRT project dependency and 
+allowing this to use the DTP project instead. The BIRT project team members originally working on 
+this component will continue to work on this project within the DTP project. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS30">BPS 30</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110677">110677</a>]
+[Theme: Design for extensibility]
+
+<p><b>Provide Plug-in Adapter for BIRT ODA Drivers to DTP ODA</b>
+The ODA Runtime Extension Point and Java Interface components will be part of the Eclipse Data Tools 
+Project (DTP) going forward. All ODA Consumer applications are expected to upgrade and adopt the DTP 
+ODA framework and namespace in lieu of the BIRT ODA namespace. For compatibility with existing 
+adapters, this project will provide a plug-in adapter for BIRT ODA drivers that implement the BIRT 
+ODA 2.0.x interfaces. This will allow a DTP ODA consumer application to consume existing BIRT ODA 
+data providers without any source code or binary build changes.  However, if an ODA data provider 
+wants to implement any of the enhancements added to ODA version 3.0 or later, its implementation 
+must migrate and adopt the DTP ODA interfaces. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS30">BPS 30</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110678">110678</a>]
+[Theme: Design for extensibility]
+</blockquote>
+
+<h4>Export Report Data</h4>
+<blockquote>
+<p><b>Data Extraction from a Saved Report</b>
+This project supports data extraction from a report at several different levels: 1) Report 
+level 2) Dataset level 3) Report item level for a table, list, or chart items 4) Report item 
+instance. Extraction at the report level can be achieved by repeatedly retrieving data for each 
+dataset. Extraction at the report item instance level would include computed columns as normal 
+columns. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS32">BPS 32</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110679">110679</a>]
+[Theme: Simple to use, Appeal to a Broader Community]
+
+<p><b>Ability to Export Report Data as CSV</b>
+Building on the infrastructure of exporting data from a report, this project allows the end user 
+to extract report data as a CSV formatted file. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS32">BPS 32</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110680">110680</a>]
+[Theme: Simple to use, Appeal to a Broader Community]
+</blockquote>
+
+<h4>Pass-through of external context objects</h4>
+<blockquote>
+The BIRT engine is often embedded as part of a middle-tier application server, where the BIRT 
+components are added to the mix of various J2EE components. During report run-time, some of these 
+other components may instantiate context objects, which are served to the BIRT engine for its custom 
+data source to use. The BIRT engine will thus need to pass through such external Java objects into 
+the BIRT data source components for consumption. These context objects are assumed to be dynamically 
+instantiated at report run-time, and are not statically defined in a report design. The scope of this 
+project thus focuses on data source specific run-time Java objects which are instantiated external to 
+BIRT, and are passed through to a custom data source provider plugged in the BIRT engine. Some 
+examples of the types of external context objects that may be passed through to a BIRT data source 
+provider include, an open JDBC connection, a pooled connection, user authorization keys, or query 
+parameter values collected outside of BIRT. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS35">BPS 35</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110682">110682</a>]
+[Theme: Design for extensibility]
+</blockquote>
+
+<h2><a name="Defects">Defects</a></h2>
+BIRT 2.0 will address defects reported by project members and the community. The 
+<a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=BIRT&target_milestone=2.0.0+Final&target_milestone=2.0.0+M1&target_milestone=2.0.0+M2&target_milestone=2.0.0+M3&target_milestone=2.0.0+M4&tar">list of defects</a> 
+targeted for resolution in BIRT 2.0 can be found in the bugzilla database on 
+<a href="https://bugs.eclipse.org/bugs">https://bugs.eclipse.org/bugs</a>.
+
+</body>
+</html>
+
+
+</body>
+</html>
+
diff --git a/project/project_plan_R2_0_0_Draft.html b/project/project_plan_R2_0_0_Draft.html
index 939d427..9fb6a5d 100644
--- a/project/project_plan_R2_0_0_Draft.html
+++ b/project/project_plan_R2_0_0_Draft.html
@@ -11,7 +11,7 @@
 <body>
 
 <p class="head">BIRT Project DRAFT 2.0 Plan</p>
-<p class="subhead">Last revised 28 September, 2005</p>
+<p class="subhead">Last revised 9 December, 2005 (<img src="/birt/project/new.gif" alt="New since last update" width="12" height="12"> marks interesting changes since the previous draft of 28 September, 2005) </p>
 
 
 <h2><a name="Introduction"></a>Introduction</h2><p>
@@ -81,8 +81,8 @@
   <li>Friday, September 16, 2005 BIRT 2.0 M1</li>
   <li>Monday, October 24, 2005 BIRT 2.0 M2</li>
   <li>Monday, November 21, 2005 BIRT 2.0 M3</li>
-  <li>Monday, December 5, 2005 BIRT 2.0 Release Candidate</li>
-  <li>Friday, December 30, 2005 BIRT 2.0</li>
+  <li>Friday, December 30, 2005 BIRT 2.0 Release Candidate </li>
+  <li>Friday, January 20, 2006 BIRT 2.0</li>
 </ul>
 
 <p>
@@ -400,30 +400,25 @@
 percentage of the total sales for that quarter. Such &#8220;two-pass&#8221; aggregates require BIRT to make 
 one pass over the data to compute the total for the quarter, then a second pass to generate the 
 report. This multi-pass aggregation is not supported by all data sources. This project therefore 
-extends BIRT to provide support for multi-pass aggregates for all data sources. [BPS 2][Bugzilla 
+extends BIRT to provide support for multi-pass aggregates for all data sources. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS2">BPS 2</a>][Bugzilla 
 ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110640">110640</a>][Theme: Simple to 
 use, Appeal to a Broader Community]</p>
 
   <p><b>Top N / Bottom N Report Layout</b>
 Top N / Bottom N reports display information that is typically sorted by an aggregated number, for 
 example, a report that lists the top 3 performing sales people. This project will provide 
-capabilities to easily create a Top N / Bottom N type report section. [BPS 2][Bugzilla ID: 
+capabilities to easily create a Top N / Bottom N type report section. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS2">BPS 2</a>][Bugzilla ID: 
 <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110641">110641</a>][Theme: Simple to use]</p>
 
   <p><b>Provide support for binding Blob/Clob data to report controls</b>
-Many database schemas, such as those used for call center or customer support applications, contain 
-columns defined as character large objects (CLOBs). These fields contain, for example, the variable 
-length and free format text notes that the call center representative takes when speaking to a 
-customer. This project will provide easy support for displaying CLOBs in a BIRT report. [BPS 3]
-[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110642">110642</a>][Theme: Simple to use, Appeal to a Broader Community]
-
-</blockquote>
+Many database  schemas, such as those used for call center or customer support applications,  contain columns defined as character large objects (CLOBs). These fields  contain, for example, the variable length and free format text notes that the  call center representative takes when speaking to a customer. <img src="new.gif" alt="New since last update to plan" width="12" height="12">In addition, an  human resources system might store pictures of employees in a database as  binary large objects (BLOBS). This project will provide easy support for  displaying BLOBS/CLOBs in a BIRT report. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS3">BPS 3</a>]
+[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110642">110642</a>][Theme: Simple to use, Appeal to a Broader Community]</blockquote>
 
 <h4>BIRT Java Script Objects</h4>
 <blockquote>  
 
 <p>BIRT 1.0 included support for many of the scripting object capabilities that are in JavaScript. 
-This project is intended to add more scripting objects. [BPS 4]
+This project is intended to add more scripting objects. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS4">BPS 4</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110644">110644</a>][Theme: Simple to use]
 
 </blockquote>
@@ -441,11 +436,11 @@
 acceptable performance. 
 
 This feature consists of two projects:
-1) providing the application developer with page-on-demand viewing API&#8217;s. [BPS 22]
+1) providing the application developer with page-on-demand viewing API&#8217;s. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS22">BPS 22</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110645">110645</a>]
 2) including an exemplary implementation of a viewing framework that allows application 
 developers to easily integrate viewing functionality into their applications and customize 
-the viewing capabilities they choose. [BPS 5]
+the viewing capabilities they choose. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS5">BPS 5</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110646">110646</a>]
 [Theme: Scaling up]
 
@@ -458,15 +453,14 @@
 application developer to integrate page navigation of BIRT reports into the application itself. 
 The definition of a page in this context needs to be flexible to accommodate differing physical 
 characteristics, or logical constructs such as a page for each customer. This project enables 
-BIRT to support multi-page report output. [BPS 19]
+BIRT to support multi-page report output. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS19">BPS 19</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110671">110671</a>]
-[Theme: Scaling up]<br>
-
+[Theme: Scaling up]
 <p><b>Hyperlinks to Other Reports</b>
 This project provides the report developer the capability to link easily to another report while 
 not hard wiring the report to a particular environment. Additionally, if a user navigates to 
 another report, it also provides the mechanisms to retain the state of the original report. 
-[BPS 5][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110648">110648</a>]
+[<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS5">BPS 5</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110648">110648</a>]
 [Theme: Simple to use]
 
 <p><b>Bookmarks (Hyperlinks into a Report Body)</b>
@@ -474,24 +468,9 @@
 a chart that has sales summaries for the Western Region. Many report items can be the target of 
 hyperlinks. The BIRT bookmark feature is a string that uniquely identifies the item instance 
 within the report. This project provides support for the bookmark concept in BIRT reports. 
-[BPS 5][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110651">110651</a>]
+[<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS5">BPS 5</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110651">110651</a>]
 [Theme: Simple to use]
 
-<p><b>Progressive Viewing</b>
-When a report is large, generating the report could take a long time. It is not efficient or user 
-friendly to require a user to wait until the whole report is generated before viewing the first 
-page. Progressive viewing allows a user to view the first few pages of a report while the remaining 
-pages are still being generated. This provides a web application with acceptable performance.
-
-This feature consists of two projects:
-1) Providing APIs for the application developer to progressively generate and view a report. 
-[BPS 22][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110652">110652</a>]
-2) Including an exemplary implementation of a viewing framework that allows application developers 
-to easily integrate viewing functionality into their applications and customize the viewing 
-capabilities they choose. [BPS 5]
-[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110654">110654</a>]
-[Theme: Scaling up]
-
 <p><b>Table of Contents Support in Viewer</b>
 A table of contents shows the hierarchical structure of a report to the end user and allows 
 the user to easily and quickly navigate to sections of the report. The hierarchy is defined by 
@@ -501,10 +480,9 @@
 hierarchy, and links from the group title jump to the first page of that group. Note that this 
 project is focused on TOC as a navigational mechanism in the report viewer, rather than providing a 
 TOC element that can be embedded in a report. This later item is a separate feature that is not 
-scheduled for this release. [BPS 5]
+scheduled for this release. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS5">BPS 5</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110655">110655</a>]
 [Theme: Simple to use]
-
 </blockquote>
 
 <h4>Report Engine Scalability and Performance</h4>
@@ -512,21 +490,21 @@
 <blockquote>
 <p><b>Memory Usage Efficiency Improvement</b>
 This project intends to enhance the BIRT engine to utilize memory more efficiently. 
-[BPS 6][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110656">110656</a>]
+[<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS6">BPS 6</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110656">110656</a>]
 [Theme: Scaling up]
 
 <p><b>Concurrent User Scalability Large Numbers of Active Users</b>
 When BIRT is deployed in a production environment with various kinds of application servers, it 
 is expected that there will be hundreds of users who concurrently need to run a BIRT report. 
 BIRT needs to be able to scale to handle running reports concurrently for large numbers of users. 
-[BPS 6][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110658">110658</a>][Theme: Scaling up]
+[<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS6">BPS 6</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110658">110658</a>][Theme: Scaling up]
 
 </blockquote>
 
 <h4>Data Engine Scalability and Performance</h4>
 <blockquote>
 <p><b>Disk-Based Sorting and Data Manipulation</b>
-Reports against large data sets with millions of rows often require the report engine to sort the data and perform aggregation. To support these scenarios, this project incorporates a sorting and aggregation capability within the BIRT Engine, which, due to the potentially large data sets, can use a combination of memory and disk for the task. [BPS 7]
+Reports against large data sets with millions of rows often require the report engine to sort the data and perform aggregation. To support these scenarios, this project incorporates a sorting and aggregation capability within the BIRT Engine, which, due to the potentially large data sets, can use a combination of memory and disk for the task. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS7">BPS 7</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110659">110659</a>]
 [Theme: Scaling up]
 
@@ -538,7 +516,7 @@
 the developer experience and productivity associated with BIRT. This project allows a report 
 developer to specify a property on a data set that limits the number of records that are 
 fetched during the development process, and that those results are cached as much as possible. 
-[BPS 7][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110660">110660</a>][Theme: Simple to use]
+[<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS7">BPS 7</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110660">110660</a>][Theme: Simple to use]
 
 </blockquote>
 
@@ -548,11 +526,16 @@
 It is often desirable to run a report and then store the results of that report for viewing later. 
 For example, generating a large (1000s of pages) report and then viewing pages individually as 
 needed. To support this scenario, this project extends BIRT to offer a way to persistently save a 
-report for viewing at some point in the future. [BPS 8]
+report for viewing at some point in the future. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS8">BPS 8</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110661">110661</a>][Theme: Scaling up]
 </blockquote>
 
-<h4>Report Template</h4>
+<h4><strong><img src="new.gif" alt="New since last update" width="12" height="12">Improved PDF Output  Generation </strong></h4>
+<blockquote>
+Robust PDF generation is a key component for reporting since many users generate PDF versions of the report for portability, printing and distribution. For BIRT, the PDF support needs to be very high quality. This project addresses issues related to PDF generation using FOP such as slow performance, limited support for lines and borders, and others. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS21">BPS 21</a>] [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=120143">120143</a>][Theme: Scaling up]
+</blockquote>
+
+<h4><strong>Report Template</strong></h4>
 <blockquote>
 When creating a new report, BIRT provides the ability to select a template for the report design. 
 With BIRT 1.0, these templates are from a predefined list that is built into the user interface. 
@@ -561,7 +544,7 @@
 the user interface, and for cheat sheets to be associated with the template. It will also be 
 possible to include associations to a style sheet and/or library with the template design. This 
 would allow the developer to provide the person consuming the template with pre-defined styles 
-and/or visual components from a library. [BPS 9]
+and/or visual components from a library. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS9">BPS 9</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110662">110662</a>][Theme: Design for extensibility]
 
 </blockquote>
@@ -572,7 +555,7 @@
 or library developer creates a library, then places it in a shared location for others to use. 
 Libraries improve developer productivity and promote report design consistency, and maintainability. 
 This project will provide library support within BIRT. This includes simple components and compound 
-compounds such as a page header with a logo and address. [BPS 10]
+compounds such as a page header with a logo and address. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS10">BPS 10</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110663">110663</a>]
 [Theme: Simple to use]
 
@@ -584,7 +567,7 @@
 This project extends the concept of styles to allow the definition of a style to be contained in a 
 separate style sheet file that can be shared across multiple reports. This will make it easy to 
 establish a common look across all the reports in an application, and if needed, to be able to 
-quickly change the look across many reports just by editing the style sheet. [BPS 11]
+quickly change the look across many reports just by editing the style sheet. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS11">BPS 11</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110746">110746</a>]
 [Theme: Scaling up, Simple to use]
 
@@ -594,7 +577,7 @@
 feel of the web site. This project allows the BIRT report developer to &quot;point&quot; to an existing CSS 
 style sheet file and import this for use within their report design to define various elements of 
 the report such as fonts, colors, and others. A future project will look at using a CSS style sheet 
-directly without the need to import. [BPS 11]
+directly without the need to import. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS11">BPS 11</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110664">110664</a>]
 [Theme: Simple to use]
 
@@ -606,7 +589,7 @@
 improve code editing, BIRT will leverage an Eclipse perspective for working with code in BIRT. 
 Perspectives exploit the power of Eclipse to the report designer&#8217;s benefit.  In addition, they 
 are a way to provide rich functionality by leveraging the Eclipse environment. This project will 
-provide support for and a perspective for Java Code Editing for BIRT reports. [BPS 12]
+provide support for and a perspective for Java Code Editing for BIRT reports. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS12">BPS 12</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110665">110665</a>]
 [Theme: Simple to use]
 
@@ -620,18 +603,23 @@
 total sales closed by a particular salesperson. In order to support the more complex scenario, 
 BIRT should allow report developers to specify that the list of values for a parameter be 
 dynamically populated at run time. The goal of this project is to provide built-in support for 
-dynamic parameters. [BPS 14]
+dynamic parameters. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS14">BPS 14</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110666">110666</a>]
 [Theme: Simple to use]
 
 </blockquote>
 
+<h4><img src="new.gif" alt="New since last update" width="12" height="12">Cascading Dynamic Parameter Lists</h4>
+<blockquote>
+Parameterized BIRT reports can be used to provide a highly personalized experience. Building on the support for Dynamic Parameter Lists, a report may require an end user, at run time, to specify more than 1 parameter that are cascaded together. For example, a regional sales report may require the user to specify parameters for the State and City. Suppose the user selects California for the state. The user may then want to see the sales information for a specific city. The user would then specify a value for the City parameter of the report. However, the values for the City parameter list would depend on the value selected for the State parameter and would dynamically at run time be populated with cities in California. This project concerns itself with providing the report developer with the ability to define dynamic parameters that are cascaded together as described above. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS14">BPS 14</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=120145">120145</a>][Theme: Simple to use]
+
+</blockquote>
 <h4>Chart Builder and Wizard</h4>
 <blockquote>
 BIRT includes support for including charts within a report design. The goal for this project 
 is to improve the usability of the chart control. We will be looking at both a Wizard/Builder 
 approach for common usage/charts, in addition to a more advanced capability for report 
-developers who want to control the chart in more detail. [BPS 15]
+developers who want to control the chart in more detail. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS15">BPS 15</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110667">110667</a>]
 [Theme: Simple to use]
 
@@ -643,7 +631,7 @@
 non-visual components in a report. The Property Editor is not currently available for elements 
 in a chart within a report design. For consistency and developer productivity reasons, this 
 project aims to allow the Property Editor to be used for commonly changed properties in a 
-chart. [BPS 16][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110668">110668</a>]
+chart. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS16">BPS 16</a>][Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110668">110668</a>]
 [Theme: Simple to use]
 </blockquote>
 
@@ -652,7 +640,7 @@
 This project looks at the charting component of BIRT to make a number of significant improvements 
 in chart specification and generation. Examples of improvements to be made include, the ability 
 to use report styles in charts, handling the situation when labels on the X-axis overlap, 
-specifying a legend title, or marker shapes. [BPS17]
+specifying a legend title, or marker shapes. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS17">BPS 17</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110669">110669</a>]
 [Theme: Simple to use]
 </blockquote>
@@ -663,7 +651,7 @@
 specific needs requested by their end users. For example, to highlight specific visual elements 
 in a chart based on data values such as expanding the pie slice for the median data value. This 
 project will provide the ability within BIRT to control the behavior of a chart with methods on 
-the chart control. [BPS 18]
+the chart control. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS18">BPS 18</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110670">110670</a>]
 [Theme: Simple to use]
 </blockquote>
@@ -673,7 +661,7 @@
 With the Expression Builder in BIRT 1.0, it is awkward to build the expression using the user 
 interface. There are a number of improvements that can be made to make it easier to navigate 
 around the functions, and to provide the user with help on each of the functions that are 
-available. This project implements those usability improvements. [BPS 20]
+available. This project implements those usability improvements. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS20">BPS 20</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110672">110672</a>]
 [Theme: Simple to use]
 </blockquote>
@@ -685,7 +673,7 @@
 report against XML data sources. Additionally, most ERP and CRM applications now provide 
 interfaces to deliver data in XML. This project provides an out of the box adapter to access 
 XML data sources. This can be used &quot;as is&quot; or as an example ODA connector that can be adapted 
-for other purposes. [BPS 23]
+for other purposes. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS23">BPS 23</a>]]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110673">110763</a>]
 [Theme: Simple to use, Appeal to a Broader Community]
 </blockquote>
@@ -695,7 +683,7 @@
 Certain data sources, such as those accessing data in RDBMS's, support the concept of stored 
 procedures and functions. These constructs provide the capability to pass in parameters as well as 
 pass out resulting data values. This project concerns itself with building the capability to access 
-the output parameters from these types of constructs via BIRT scripting capability. [BPS 24]
+the output parameters from these types of constructs via BIRT scripting capability. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS24">BPS 24</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110765">110765</a>]
 [Theme: Simple to use, Appeal to a Broader Community]
 </blockquote>
@@ -705,7 +693,7 @@
 The BIRT Design Engine API allows developers to programmatically manipulate a report design using 
 an API, rather than manipulating the XML directly. This API was introduced in BIRT 1.0 and is used 
 extensively within the BIRT project itself. This project makes some enhancements to the Design 
-Engine API based on feedback from the community and the BIRT project&#8217;s own use of the API. [BPS 29]
+Engine API based on feedback from the community and the BIRT project&#8217;s own use of the API. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS29">BPS 29</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110676">110676</a>]
 [Theme: Design for extensibility]
 </blockquote>
@@ -717,7 +705,7 @@
 This BIRT project will move these components from the BIRT areas of Eclipse to DTP and make any 
 naming changes as needed. This includes reviewing and removing any BIRT project dependency and 
 allowing this to use the DTP project instead. The BIRT project team members originally working on 
-this component will continue to work on this project within the DTP project. [BPS 30]
+this component will continue to work on this project within the DTP project. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS30">BPS 30</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110677">110677</a>]
 [Theme: Design for extensibility]
 
@@ -729,7 +717,7 @@
 ODA 2.0.x interfaces. This will allow a DTP ODA consumer application to consume existing BIRT ODA 
 data providers without any source code or binary build changes.  However, if an ODA data provider 
 wants to implement any of the enhancements added to ODA version 3.0 or later, its implementation 
-must migrate and adopt the DTP ODA interfaces. [BPS 30]
+must migrate and adopt the DTP ODA interfaces. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS30">BPS 30</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110678">110678</a>]
 [Theme: Design for extensibility]
 </blockquote>
@@ -741,29 +729,17 @@
 level 2) Dataset level 3) Report item level for a table, list, or chart items 4) Report item 
 instance. Extraction at the report level can be achieved by repeatedly retrieving data for each 
 dataset. Extraction at the report item instance level would include computed columns as normal 
-columns. [BPS 32]
+columns. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS32">BPS 32</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110679">110679</a>]
 [Theme: Simple to use, Appeal to a Broader Community]
 
 <p><b>Ability to Export Report Data as CSV</b>
 Building on the infrastructure of exporting data from a report, this project allows the end user 
-to extract report data as a CSV formatted file. [BPS 32]
+to extract report data as a CSV formatted file. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS32">BPS 32</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110680">110680</a>]
 [Theme: Simple to use, Appeal to a Broader Community]
 </blockquote>
 
-<h4>Reportlet</h4>
-<blockquote>
-Web pages often use HTML tables instead to organize and position their content. In order to provide 
-more flexibility for integrating report content into the customer&#8217; web pages, it becomes necessary 
-to introduce a new set of formats that return content as &#8220;Reportlets&#8221; or partial DHTML pages.  These 
-reportlets can then be included within web pages generated by the customer&#8217;s web application. This 
-project focuses on producing content that is easily embeddable within an overall HTML page. [BPS 34]
-[Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110681">110681</a>]
-[Theme: Simple to use, Appeal to a Broader Community]
-
-</blockquote>
-
 <h4>Pass-through of external context objects</h4>
 <blockquote>
 The BIRT engine is often embedded as part of a middle-tier application server, where the BIRT 
@@ -776,7 +752,7 @@
 BIRT, and are passed through to a custom data source provider plugged in the BIRT engine. Some 
 examples of the types of external context objects that may be passed through to a BIRT data source 
 provider include, an open JDBC connection, a pooled connection, user authorization keys, or query 
-parameter values collected outside of BIRT. [BPS 35]
+parameter values collected outside of BIRT. [<a href="http://www.eclipse.org/birt/wiki/index.php?n=BPS.BPS35">BPS 35</a>]
 [Bugzilla ID: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=110682">110682</a>]
 [Theme: Design for extensibility]
 </blockquote>
diff --git a/ref/main.html b/ref/main.html
index 9280b5d..529d3f0 100644
--- a/ref/main.html
+++ b/ref/main.html
@@ -15,7 +15,7 @@
 <h1>Report Object Model Documentation</h1>
 
 <span style="color: red; font-weight: bold">New! </span>The
-<a class="top" href="rom/index.html">ROM documenation</a> is now
+<a class="top" href="rom/index.html">ROM documentation</a> is now
 in new "RomDoc" format complete with indexes, cross references, information taken
 directly from implementation, and so on.
 
diff --git a/survey/index.html b/survey/index.html
index 0c3a5f9..7048802 100644
--- a/survey/index.html
+++ b/survey/index.html
@@ -8,6 +8,7 @@
 <LINK REL="shortcut icon" HREF="http://www.eclipse.org/images/eclipse.ico"
 	  TYPE="image/x-icon">
 <SCRIPT LANGUAGE="JavaScript">
+var currentQuestion = 0;
 function enable_submit() {
 	var submit = document.getElementById("SUBMIT");
 	submit.disabled = false;
@@ -20,8 +21,25 @@
 	var div = document.getElementById("DIVTHANKS");
 	div.style.display = "none";
 }
+
+function doReset() {
+	//alert(currentQuestion);
+
+	for(i = 9; i > currentQuestion; i--) {
+		if( i == 2 ) {
+			i--;
+		}
+		var docDiv = "DIVQ" + (i + 2);
+		//alert(docDiv);
+		var nextDiv = document.getElementById(docDiv);
+		nextDiv.style.display = "none";
+		validate();
+	}
+
+}
 function answer1()
 {
+	currentQuestion = 1;
     var a1 = document.getElementsByName("A1");
    	var next = document.getElementById("DIVQ2");
 	var a1text = document.getElementById("A1TEXT");
@@ -31,7 +49,7 @@
     	next.style.display="inline";
     	a1text.disabled = true;
     	out.value = a1[0].value;
-    	answer2();
+    	//answer2();
     } else if (a1[1].checked) {
         next.style.display = "none";
         a1text.disabled = true;
@@ -45,94 +63,109 @@
    	    }
    	    out.value = a1text.value;
 	}
+	doReset();
 }
 function answer2()
 {
+	currentQuestion = 2;
     var a2 = document.getElementsByName("A2");
    	var next = document.getElementById("DIVQ3");
 	var a2text = document.getElementById("A2TEXT");
 	var out = document.getElementById("DEV");
 	disable_submit();
-    if (a2[0].checked || a2[1].checked) {
-    	next.style.display="inline";
-    	answer3();
+    if (a2[0].checked || a2[1].checked || a2[2].checked) {
+    	//next.style.display="inline";
+    	//answer3();
     	a2text.disabled = true;
     	if (a2[0].checked) {
     	    out.value=a2[0].value;
     	} else {
-    	    out.value=a2[1].value;
+    	    out.value=a2[2].value;
     	}
-    } else if (a2[2].checked) {
-   	    next.style.display="none";
-        a2text.disabled = true;
-        out.value = a2[2].value;
-        enable_submit();
+    //} else if (a2[1].checked) {
+   	//    next.style.display="none";
+    //    a2text.disabled = true;
+    //    out.value = a2[1].value;
+    //    enable_submit();
    	} else {
-   	    next.style.display="none";
+   	    //next.style.display="inline";
    	    a2text.disabled=false;
    	    if (a2text.value != "") {
-   	        enable_submit();
+   	        //enable_submit();
    	    }
    	    out.value = a2text.value;
+
 	}
+	if (out.value != "") {
+		next.style.display="inline";
+	}
+	doReset();
 }
 function answer3()
 {
+	currentQuestion = 3;
     var a3 = document.getElementsByName("A3");
-   	var next = document.getElementById("DIVQ4");
+   	var next = document.getElementById("DIVQ5");
 	var a3text = document.getElementById("A3TEXT");
 	var out = document.getElementById("IDE");
 	out.value="";
 	disable_submit();
-   	if (a3[4].checked) {
-   	    next.style.display="none";
-   	    a3text.disabled=false;
-   	    if (a3text.value != "") {
-   	        enable_submit();
-   	    }
-   	    out.value = a3text.value;
-	} else {
-    	a3text.disabled = true;
-    	for (i = 0; i < 4; ++i) {
+   	//if (a3[4].checked) {
+   	//    next.style.display="none";
+   	//    a3text.disabled=false;
+   	//    if (a3text.value != "") {
+   	//        enable_submit();
+   	//    }
+   	//    out.value = a3text.value;
+	//} else {
+
+    	for (i = 0; i < 5; ++i) {
         	if (a3[i].checked) {
-   				next.style.display="inline";
+   				//next.style.display="inline";
    				out.value = a3[i].value;
    			}
    		}
+
+		if( a3[4].checked ) {
+	    	a3text.disabled = false;
+			out.value = a3text.value;
+		}
+
     	if (out.value != "") {
    	    	next.style.display="inline";
-    		answer4();
+			doReset();
+    		//answer5();
     	}
-	}
-}
-function answer4()
-{
-    var a4 = document.getElementsByName("A4");
-   	var next = document.getElementById("DIVQ5");
-	var out = document.getElementById("REPORTWRITER");
-	disable_submit();
-    if (a4[0].checked) {
-    	next.style.display="inline";
-    	out.value = a4[0].value;
-    	answer5();
-   	} else if(a4[1].checked) {
-   	    next.style.display="none";
-   	    out.value = a4[1].value;
-   	    enable_submit();
-	}
+	//}
 }
 function answer5()
 {
+	currentQuestion = 5;
     var a5 = document.getElementsByName("A5");
     var a6 = document.getElementsByName("A6");
     var a6divs = document.getElementsByName("A6DIV");
    	var next = document.getElementById("DIVQ6");
+   	var nextSkipped = document.getElementById("DIVQ7");
 	var a5text = document.getElementById("A5TEXT");
-	var out = document.getElementById("TOOLS");
-	var out6 = document.getElementById("PRIMARY");
+	var out = document.getElementById("SCRIPTTOOLS");
+	var out6 = document.getElementById("SCRIPTPRIMARY");
 	out.value = "";
 	var numChecked = 0;
-	for (i = 0; i < 9; ++i) {
+
+	if (a5[0].checked) {
+		for(i = 1; i < 7; i++ ) {
+    	    a5[i].disabled = true;
+    	    a5[i].checked = false;
+    	}
+	    //nextSkipped.style.display="inline";
+	} else {
+		for(i = 1; i < 7; i++ ) {
+    	    a5[i].disabled = false;
+    	}
+	    //nextSkipped.style.display="none";
+	}
+
+	for (i = 0; i < 6; ++i) {
 	    if (a5[i].checked) {
 	        a6divs[i].style.display = "inline";
 	        if (out.value != "") {
@@ -145,7 +178,7 @@
 	        a6[i].checked = false;
 	    }
 	}
-    if (a5[9].checked) {
+    if (a5[6].checked) {
         a5text.disabled = false;
         if (a5text.value != "") {
         	++numChecked;
@@ -153,7 +186,7 @@
                 out.value += "|";
             }
 	        out.value += a5text.value;
-	        a6[9].value = a5text.value;
+	        a6[6].value = a5text.value;
 	        var othertext = document.getElementById("OTHERTEXT");
 	        var newtext = document.createTextNode(a5text.value);
 	        if (othertext.hasChildNodes()) {
@@ -161,90 +194,307 @@
 	        } else {
 	            othertext.appendChild(newtext);
 	        }
-	        a6divs[9].style.display = "inline";
+	        a6divs[6].style.display = "inline";
         } else {
         	var othertext = document.getElementById("OTHERTEXT");
         	if (othertext.hasChildNodes()) {
                 othertext.removeChild(othertext.childNodes[0]);
             }
-	        a6divs[9].style.display = "none";
+	        a6divs[6].style.display = "none";
         }
     } else {
         a5text.disabled = true;
         a6divs[i].style.display = "none";
         a6[i].checked = false;
     }
-    if (out.value != "" && numChecked>1) {
+
+    if (out.value != "" && numChecked > 1) {
+        a6divs[0].style.display = "inline";
 	    next.style.display="inline";
+	    nextSkipped.style.display="none";
+		doReset();
+	} else if (out.value != "" && numChecked == 1) {
+        a6divs[0].style.display = "inline";
+	    out6.value = out.value;
+		if (a5[0].checked) {
+		    nextSkipped.style.display="inline";
+		    next.style.display="none";
+		} else {
+		    next.style.display="inline";
+		}
+		doReset();
 	} else {
 	    out6.value = out.value;
 	    next.style.display="none";
 	}
-    answer6();
 }
 function answer6()
 {
+	currentQuestion = 6;
     var a6 = document.getElementsByName("A6");
     var a5 = document.getElementsByName("A5");
+   	var next = document.getElementById("DIVQ7");
 	var a5text = document.getElementById("A5TEXT");
-	var out = document.getElementById("PRIMARY");
+	var out = document.getElementById("SCRIPTPRIMARY");
 	out.value = "";
 	var numChecked = 0;
 	var lastval;
-    for (i=0; i <= 9; ++i) {
+    for (i=0; i <= 6; ++i) {
         if (a6[i].checked) {
    	        out.value = a6[i].value;
    	    }
    	    if (a5[i].checked) {
    	        ++numChecked;
-   	        lastval = (i==9) ? a5text.value : a5[i].value;
+   	        lastval = (i==6) ? a5text.value : a5[i].value;
    	    }
    	}
 
 	if (numChecked == 1) {
 	    out.value = lastval;
 	}
+
 	if (out.value != "") {
-	    enable_submit();
+   	    next.style.display="inline";
+    	//answer7();
+	    //enable_submit();
 	} else {
 	    disable_submit();
 	}
+	doReset();
 }
+
+function answer7()
+{
+	currentQuestion = 7;
+    var a7 = document.getElementsByName("A7");
+   	var next = document.getElementById("DIVQ8");
+	var out = document.getElementById("REPORTWRITER");
+	disable_submit();
+    if (a7[0].checked) {
+    	next.style.display="inline";
+    	out.value = a7[0].value;
+    	//answer8();
+   	} else if(a7[1].checked) {
+   	    next.style.display="none";
+   	    out.value = a7[1].value;
+   	    enable_submit();
+	}
+	doReset();
+}
+
+
+function answer8()
+{
+	currentQuestion = 8;
+    var a8 = document.getElementsByName("A8");
+    var a9 = document.getElementsByName("A9");
+    var a9divs = document.getElementsByName("A9DIV");
+   	var next = document.getElementById("DIVQ9");
+	var a8text = document.getElementById("A8TEXT");
+	var out = document.getElementById("TOOLS");
+	var out9 = document.getElementById("PRIMARY");
+	out.value = "";
+	var numChecked = 0;
+	for (i = 0; i < 8; ++i) {
+	    if (a8[i].checked) {
+	        a9divs[i].style.display = "inline";
+	        if (out.value != "") {
+	            out.value += "|";
+	        }
+	        out.value += a8[i].value;
+	        ++numChecked;
+	    } else {
+	        a9divs[i].style.display = "none";
+	        a9[i].checked = false;
+	    }
+	}
+    if (a8[8].checked) {
+        a8text.disabled = false;
+        if (a8text.value != "") {
+        	++numChecked;
+            if (out.value != "") {
+                out.value += "|";
+            }
+	        out.value += a8text.value;
+	        a9[8].value = a8text.value;
+	        var othertext = document.getElementById("OTHERTEXT1");
+	        var newtext = document.createTextNode(a8text.value);
+	        if (othertext.hasChildNodes()) {
+                othertext.replaceChild(newtext, othertext.childNodes[0]);
+	        } else {
+	            othertext.appendChild(newtext);
+	        }
+	        a9divs[8].style.display = "inline";
+        } else {
+        	var othertext = document.getElementById("OTHERTEXT1");
+        	if (othertext.hasChildNodes()) {
+                othertext.removeChild(othertext.childNodes[0]);
+            }
+	        a9divs[8].style.display = "none";
+        }
+    } else {
+        a8text.disabled = true;
+        a9divs[i].style.display = "none";
+        a9[i].checked = false;
+    }
+
+    if (out.value != "" && numChecked>1) {
+	    next.style.display="inline";
+	} else {
+	    out9.value = out.value;
+	    next.style.display="none";
+	}
+	doReset();
+    answer9();
+}
+
+function answer9()
+{
+	currentQuestion = 9;
+    var a9 = document.getElementsByName("A9");
+    var a8 = document.getElementsByName("A8");
+	var a8text = document.getElementById("A8TEXT");
+	var out = document.getElementById("PRIMARY");
+   	var next = document.getElementById("DIVQ10");
+	out.value = "";
+	var numChecked = 0;
+	var lastval;
+    for (i=0; i <= 8; ++i) {
+        if (a9[i].checked) {
+   	        out.value = a9[i].value;
+   	    }
+   	    if (a8[i].checked) {
+   	        ++numChecked;
+   	        lastval = (i==8) ? a8text.value : a8[i].value;
+   	    }
+   	}
+
+	if (numChecked == 1) {
+	    out.value = lastval;
+	}
+
+	if (out.value != "") {
+	    next.style.display="inline";
+	    //enable_submit();
+	} else {
+	    next.style.display="none";
+	    disable_submit();
+	}
+	doReset();
+	answer10();
+}
+
+function answer10()
+{
+	currentQuestion = 10;
+    var a10 = document.getElementsByName("A10");
+	var out = document.getElementById("INDUSTRY");
+	var a10text = document.getElementById("A10TEXT");
+   	var next = document.getElementById("DIVQ11");
+	out.value = "";
+	var numChecked = 0;
+	var lastval;
+    for (i=0; i < 12; ++i) {
+        if (a10[i].checked) {
+   	        out.value = a10[i].value;
+   	    }
+   	}
+
+	if (a10[12].checked) {
+	    out.value = a10text.value;
+	}
+
+	if (out.value != "") {
+	    next.style.display="inline";
+	    enable_submit();
+	} else {
+	    next.style.display="none";
+	    disable_submit();
+	}
+}
+
+function answer11()
+{
+	currentQuestion = 11;
+    var a11 = document.getElementById("A11");
+	var out = document.getElementById("SOURCES");
+	out.value = a11.value;
+}
+
 function validate()
 {
     var hide2 = (document.getElementById("DIVQ2").style.display=="none");
     var hide3 = (document.getElementById("DIVQ3").style.display=="none");
-    var hide4 = (document.getElementById("DIVQ4").style.display=="none");
     var hide5 = (document.getElementById("DIVQ5").style.display=="none");
     var hide6 = (document.getElementById("DIVQ6").style.display=="none");
+    var hide7 = (document.getElementById("DIVQ7").style.display=="none");
+    var hide8 = (document.getElementById("DIVQ8").style.display=="none");
+    var hide9 = (document.getElementById("DIVQ9").style.display=="none");
+    var hide10= (document.getElementById("DIVQ10").style.display=="none");
+    var hide11= (document.getElementById("DIVQ11").style.display=="none");
 
 	var a2 = document.getElementById("DEV");
 	var a3 = document.getElementById("IDE");
-	var a4 = document.getElementById("REPORTWRITER");
-	var a5 = document.getElementById("TOOLS");
-	var a6 = document.getElementById("PRIMARY");
+	var a5 = document.getElementById("SCRIPTTOOLS");
+	var a6 = document.getElementById("SCRIPTPRIMARY");
+	var a7 = document.getElementById("REPORTWRITER");
+	var a8 = document.getElementById("TOOLS");
+	var a9 = document.getElementById("PRIMARY");
+	var a10 = document.getElementById("INDUSTRY");
+	var a11 = document.getElementById("SOURCES");
+
     if (hide2) {
         a2.value = "";
         a3.value = "";
-        a4.value = "";
         a5.value = "";
         a6.value = "";
+        a7.value = "";
+        a8.value = "";
+        a9.value = "";
+        a10.value = "";
+        a11.value = "";
     } else if (hide3) {
         a3.value = "";
-        a4.value = "";
         a5.value = "";
         a6.value = "";
-    } else if (hide4) {
-        a4.value = "";
-        a5.value = "";
-        a6.value = "";
+        a7.value = "";
+        a8.value = "";
+        a9.value = "";
+        a10.value = "";
+        a11.value = "";
     } else if (hide5) {
         a5.value = "";
         a6.value = "";
+        a7.value = "";
+        a8.value = "";
+        a9.value = "";
+        a11.value = "";
     } else if (hide6) {
-        a6.value = a5.value;
+        a6.value = "";
+        a7.value = "";
+        a8.value = "";
+        a9.value = "";
+        a10.value = "";
+        a11.value = "";
+    } else if (hide7) {
+        a8.value = "";
+        a9.value = "";
+        a10.value = "";
+        a11.value = "";
+    } else if (hide8) {
+        a9.value = "";
+        a10.value = "";
+        a11.value = "";
+    } else if (hide9) {
+        a9.value = "";
+        a10.value = "";
+        a11.value = "";
+    } else if (hide10) {
+        a10.value = "";
+        a11.value = "";
+    } else if (hide11) {
+        a11.value = "";
 	}
-
 }
 </SCRIPT>
 </head>
@@ -254,25 +504,19 @@
 <table border=0 width=100%>
 <tr>
 <td>
-<p class=indextop>Reporting Survey</p>
+<p class=indextop></p>
 </td>
 <td style="text-align: right">
-<img src="http://www.eclipse.org/downloads/images/survey.gif">
+<!-- <img src="http://www.eclipse.org/downloads/images/survey.gif"> -->
 </td>
 </tr>
 </table>
 <p>
 <table border=0>
 <tr><td>
-Thank you for agreeing to take this short survey.  We are interested in how you 
-create reports in your applications.   The information collected from this survey 
-will be published at a later date and all information will be used in compliance 
-with the
+Thank you for agreeing to spend 60 seconds taking this survey on your development environment.  All information collected from this survey will be published at a later date and all information will be used in compliance with the
 <a href="http://www.eclipse.org/legal/privacy.html">Eclipse Foundation privacy policy</a>.
-<p>
-<i>&ndash; The <a href="/birt" target="_top">BIRT</a> PMC</i>  
-<p>
-
+<br><br>
 
     <DIV ID="DIVQ1">
         <B>What is your primary development language?</B><BR>
@@ -281,71 +525,128 @@
         <INPUT type="radio" name="A1" id="A1" VALUE="OTHER" onclick="answer1()">Other:</INPUT>
         <INPUT type="text" name="A1TEXT" id="A1TEXT" STYLE="border-style:groove" DISABLED="TRUE" onkeyup="answer1()"></INPUT><BR>
         <P>
+    </DIV>
     <DIV ID="DIVQ2" STYLE="display:none">
         <B>Which Java technology do you primarily use?</B><BR>
         <INPUT type="radio" id="A2" name="A2" VALUE="J2EE" onclick="answer2()">J2EE</INPUT><BR>
-        <INPUT type="radio" id="A2" name="A2" VALUE="J2SE" onclick="answer2()">J2SE</INPUT><BR>
         <INPUT type="radio" id="A2" name="A2" VALUE="J2ME" onclick="answer2()">J2ME</INPUT><BR>
+        <INPUT type="radio" id="A2" name="A2" VALUE="J2SE" onclick="answer2()">J2SE</INPUT><BR>
         <INPUT type="radio" id="A2" name="A2" VALUE="OTHER" onclick="answer2()">Other:</INPUT>
         <INPUT type="text" id="A2TEXT" name="A2TEXT" STYLE="border-style:groove" DISABLED="TRUE" onkeyup="answer2()"></INPUT><BR>
         <P>
+    </DIV>
     <DIV ID="DIVQ3" STYLE="display:none">
         <B>What is your primary Java IDE?</B><BR>
         <INPUT type="radio" id="A3" name="A3" VALUE="ECLIPSE" onclick="answer3()">Eclipse</INPUT><BR>
+        <INPUT type="radio" id="A3" name="A3" VALUE="BORLAND" onclick="answer3()">Borland Together Edition for Eclipse</INPUT><BR>
         <INPUT type="radio" id="A3" name="A3" VALUE="WEBSPHERE" onclick="answer3()">IBM Websphere Studio</INPUT><BR>
         <INPUT type="radio" id="A3" name="A3" VALUE="NETWEAVER" onclick="answer3()">SAP Netweaver</INPUT><BR>
-        <INPUT type="radio" id="A3" name="A3" VALUE="BORLAND" onclick="answer3()">Borland Together Edition for Eclipse</INPUT><BR>
         <INPUT type="radio" id="A3" name="A3" VALUE="OTHER" onclick="answer3()">Other:</INPUT>
         <INPUT type="text" id="A3TEXT" name="A3TEXT" STYLE="border-style:groove" DISABLED="TRUE" onkeyup="answer3()"></INPUT><BR>
         <P>
-    <DIV ID="DIVQ4" STYLE="display:none">
-        <B>Do you write reports (i.e. format database data on a web page or printer?)</B><BR>
-        <INPUT type="radio" id="A4" name="A4" VALUE="YES" onclick="answer4()">Yes</INPUT><BR>
-        <INPUT type="radio" id="A4" name="A4" VALUE="NO" onclick="answer4()">No</INPUT><BR>
-        <P>
+    </DIV>
     <DIV ID="DIVQ5" STYLE="display:none">
-        <B>What tool(s) do you use for your reporting on this project? (Click all that apply.)</B><BR>
-        <INPUT type="checkbox" id="A5" name="A5" VALUE="BIRT" onclick="answer5()">BIRT</INPUT><BR>
-        <INPUT type="checkbox" id="A5" name="A5" VALUE="CRYSTAL" onclick="answer5()">Crystal Reports</INPUT><BR>
-        <INPUT type="checkbox" id="A5" name="A5" VALUE="JASPER" onclick="answer5()">Jasper Reports</INPUT><BR>
-        <INPUT type="checkbox" id="A5" name="A5" VALUE="JSP" onclick="answer5()">Java/JSP</INPUT><BR>
-        <INPUT type="checkbox" id="A5" name="A5" VALUE="JFREE" onclick="answer5()">Jfree Report</INPUT><BR>
-        <INPUT type="checkbox" id="A5" name="A5" VALUE="JREPORTS" onclick="answer5()">Jreports</INPUT><BR>
-        <INPUT type="checkbox" id="A5" name="A5" VALUE="PANSCOPIC" onclick="answer5()">Panscopic</INPUT><BR>
-        <INPUT type="checkbox" id="A5" name="A5" VALUE="REPORTNET" onclick="answer5()">ReportNet</INPUT><BR>
-        <INPUT type="checkbox" id="A5" name="A5" VALUE="STYLE" onclick="answer5()">Style Reports</INPUT><BR>
-        <INPUT type="checkbox" id="A5" name="A5" VALUE="OTHER" onclick="answer5()">Other</INPUT>
+        <B>Which scripting languages do you use?</B><BR>
+        <INPUT type="checkbox" id="A5" name="A5" VALUE="NONE" onclick="answer5()">None</INPUT><BR>
+        <INPUT type="checkbox" id="A5" name="A5" VALUE="JAVASCRIPT" onclick="answer5()">JavaScript</INPUT><BR>
+        <INPUT type="checkbox" id="A5" name="A5" VALUE="PERL" onclick="answer5()">Perl</INPUT><BR>
+        <INPUT type="checkbox" id="A5" name="A5" VALUE="PHP" onclick="answer5()">PHP</INPUT><BR>
+        <INPUT type="checkbox" id="A5" name="A5" VALUE="PYTHON" onclick="answer5()">Python</INPUT><BR>
+        <INPUT type="checkbox" id="A5" name="A5" VALUE="RUBY" onclick="answer5()">Ruby</INPUT><BR>
+        <INPUT type="checkbox" id="A5" name="A5" VALUE="OTHER" onclick="answer5()">Other:</INPUT>
         <INPUT type="text" id="A5TEXT" name="A5TEXT" STYLE="border-style:groove" DISABLED="TRUE" onkeyup="answer5()"></INPUT><BR>
         <P>
+    </DIV>
     <DIV ID="DIVQ6" STYLE="display:none">
-        <B>What is your <I>primary</I> reporting tool on this project?</B><BR>
-        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="BIRT" onclick="answer6()"/>BIRT<BR></DIV>
-        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="CRYSTAL" onclick="answer6()"/>Crystal Reports<BR></DIV>
-        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="JASPER" onclick="answer6()"/>Jasper Reports<BR></DIV>
-        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="JSP" onclick="answer6()"/>Java/JSP<BR></DIV>
-        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="JFREE" onclick="answer6()"/>Jfree Reports<BR></DIV>
-        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="JREPORTS" onclick="answer6()"/>Jreports<BR></DIV>
-        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="PANSCOPIC" onclick="answer6()"/>Panscopic<BR></DIV>
-        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="REPORTNET" onclick="answer6()"/>ReportNet<BR></DIV>
-        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="STYLE" onclick="answer6()"/>Style Reports<BR></DIV>
+        <B>On your Java projects, what is the <I>primary</I> scripting language used?</B><BR>
+        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="NONE" onclick="answer6()">None</INPUT><BR></DIV>
+        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="JAVASCRIPT" onclick="answer6()">JavaScript</INPUT><BR></DIV>
+        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="PERL" onclick="answer6()">Perl</INPUT><BR></DIV>
+        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="PHP" onclick="answer6()">PHP</INPUT><BR></DIV>
+        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="PYTHON" onclick="answer6()">Python</INPUT><BR></DIV>
+        <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="RUBY" onclick="answer6()">Ruby</INPUT><BR></DIV>
         <DIV ID="A6DIV" name="A6DIV" STLYE="display:none"><INPUT type="radio" id="A6" name="A6" VALUE="OTHER" onclick="answer6()"/><SPAN ID="OTHERTEXT" NAME="OTHERTEXT"></SPAN></DIV>
         <P>
     </DIV>
+    <DIV ID="DIVQ7" STYLE="display:none">
+        <B>Do you write reports (i.e. format database data on a web page or printer?)</B><BR>
+        <INPUT type="radio" id="A7" name="A7" VALUE="YES" onclick="answer7()">Yes</INPUT><BR>
+        <INPUT type="radio" id="A7" name="A7" VALUE="NO" onclick="answer7()">No</INPUT><BR>
+        <P>
     </DIV>
+    <DIV ID="DIVQ8" STYLE="display:none">
+        <B>What tool(s) do you use for your reporting on this project? (Click all that apply.)</B><BR>
+        <INPUT type="checkbox" id="A8" name="A8" VALUE="BIRT" onclick="answer8()">BIRT</INPUT><BR>
+        <INPUT type="checkbox" id="A8" name="A8" VALUE="CRYSTAL" onclick="answer8()">Crystal Reports</INPUT><BR>
+        <INPUT type="checkbox" id="A8" name="A8" VALUE="JASPER" onclick="answer8()">Jasper Reports</INPUT><BR>
+        <INPUT type="checkbox" id="A8" name="A8" VALUE="JSP" onclick="answer8()">Java/JSP</INPUT><BR>
+        <INPUT type="checkbox" id="A8" name="A8" VALUE="JFREE" onclick="answer8()">Jfree Report</INPUT><BR>
+        <INPUT type="checkbox" id="A8" name="A8" VALUE="JREPORTS" onclick="answer8()">Jreports</INPUT><BR>
+        <!-- <INPUT type="checkbox" id="A8" name="A8" VALUE="PANSCOPIC" onclick="answer8()">Panscopic</INPUT><BR> -->
+        <INPUT type="checkbox" id="A8" name="A8" VALUE="REPORTNET" onclick="answer8()">ReportNet</INPUT><BR>
+        <INPUT type="checkbox" id="A8" name="A8" VALUE="STYLE" onclick="answer8()">Style Reports</INPUT><BR>
+        <INPUT type="checkbox" id="A8" name="A8" VALUE="OTHER" onclick="answer8()">Other</INPUT>
+        <INPUT type="text" id="A8TEXT" name="A8TEXT" STYLE="border-style:groove" DISABLED="TRUE" onkeyup="answer8()"></INPUT><BR>
+        <P>
     </DIV>
+    <DIV ID="DIVQ9" STYLE="display:none">
+        <B>What is your <I>primary</I> reporting tool on this project?</B><BR>
+        <DIV ID="A9DIV" name="A9DIV" STLYE="display:none"><INPUT type="radio" id="A9" name="A9" VALUE="BIRT" onclick="answer9()"/>BIRT<BR></DIV>
+        <DIV ID="A9DIV" name="A9DIV" STLYE="display:none"><INPUT type="radio" id="A9" name="A9" VALUE="CRYSTAL" onclick="answer9()"/>Crystal Reports<BR></DIV>
+        <DIV ID="A9DIV" name="A9DIV" STLYE="display:none"><INPUT type="radio" id="A9" name="A9" VALUE="JASPER" onclick="answer9()"/>Jasper Reports<BR></DIV>
+        <DIV ID="A9DIV" name="A9DIV" STLYE="display:none"><INPUT type="radio" id="A9" name="A9" VALUE="JSP" onclick="answer9()"/>Java/JSP<BR></DIV>
+        <DIV ID="A9DIV" name="A9DIV" STLYE="display:none"><INPUT type="radio" id="A9" name="A9" VALUE="JFREE" onclick="answer9()"/>Jfree Reports<BR></DIV>
+        <DIV ID="A9DIV" name="A9DIV" STLYE="display:none"><INPUT type="radio" id="A9" name="A9" VALUE="JREPORTS" onclick="answer9()"/>Jreports<BR></DIV>
+        <!-- <DIV ID="A9DIV" name="A9DIV" STLYE="display:none"><INPUT type="radio" id="A9" name="A9" VALUE="PANSCOPIC" onclick="answer9()"/>Panscopic<BR></DIV> -->
+        <DIV ID="A9DIV" name="A9DIV" STLYE="display:none"><INPUT type="radio" id="A9" name="A9" VALUE="REPORTNET" onclick="answer9()"/>ReportNet<BR></DIV>
+        <DIV ID="A9DIV" name="A9DIV" STLYE="display:none"><INPUT type="radio" id="A9" name="A9" VALUE="STYLE" onclick="answer9()"/>Style Reports<BR></DIV>
+        <DIV ID="A9DIV" name="A9DIV" STLYE="display:none"><INPUT type="radio" id="A9" name="A9" VALUE="OTHER" onclick="answer9()"/><SPAN ID="OTHERTEXT1" NAME="OTHERTEXT1"></SPAN></DIV>
+        <P>
     </DIV>
+    <DIV ID="DIVQ10" STYLE="display:none">
+        <B>What industry group does your company fall within?</B><BR>
+        <INPUT type="radio" id="A10" name="A10" VALUE="RATHERNOTSAY" onclick="answer10()"/>Rather Not Say<BR>
+        <INPUT type="radio" id="A10" name="A10" VALUE="AUTOMOTIVE" onclick="answer10()"/>Automotive<BR>
+        <INPUT type="radio" id="A10" name="A10" VALUE="COMPUTERSOFTWARE" onclick="answer10()"/>Computer Software<BR>
+        <INPUT type="radio" id="A10" name="A10" VALUE="CONSUMERPRODUCTS" onclick="answer10()"/>Consumer Products<BR>
+        <INPUT type="radio" id="A10" name="A10" VALUE="ELECTRONICS" onclick="answer10()"/>Electronics<BR>
+        <INPUT type="radio" id="A10" name="A10" VALUE="ENERGYUTILITIES" onclick="answer10()"/>Energy & Utilities<BR>
+        <INPUT type="radio" id="A10" name="A10" VALUE="FINANCIALSERVICES" onclick="answer10()"/>Financial Services (Insurance, Banking, Financial Markets)<BR>
+        <INPUT type="radio" id="A10" name="A10" VALUE="GOVERNMENT" onclick="answer10()"/>Government<BR>
+        <INPUT type="radio" id="A10" name="A10" VALUE="HEALTH" onclick="answer10()"/>Health<BR>
+        <INPUT type="radio" id="A10" name="A10" VALUE="LIFESCIENCES" onclick="answer10()"/>Life Sciences<BR>
+        <INPUT type="radio" id="A10" name="A10" VALUE="RETAILWHOLESALE" onclick="answer10()"/>Retail/Wholesale<BR>
+        <INPUT type="radio" id="A10" name="A10" VALUE="TELECOM" onclick="answer10()"/>Telecom<BR>
+<!--        <INPUT type="radio" id="A10" name="A10" VALUE="OTHER" onclick="answer10()"/><SPAN ID="OTHERTEXT2" NAME="OTHERTEXT2"></SPAN> -->
+        <INPUT type="radio" id="A10" name="A10" VALUE="OTHER" onclick="answer10()">Other</INPUT>
+		<INPUT type="text" id="A10TEXT" name="A10TEXT" STYLE="border-style:groove" onkeyup="answer10()"></INPUT>
+        <P>
     </DIV>
+    <DIV ID="DIVQ11" STYLE="display:none">
+        <B>What source(s) do you rely on for information and recommendations about open source reporting and analysis tools?</B><BR>
+        <INPUT type="text" id="A11" name="A11" SIZE="60" onBlur="answer11()"/><BR>
     </DIV>
 
 <FORM ACTION="submit.php" METHOD="POST" onsubmit="validate()">
+
 	<INPUT type="hidden" id="LANGUAGE" name="LANGUAGE">
 	<INPUT type="hidden" id="DEV" name="DEV">
 	<INPUT type="hidden" id="IDE" name="IDE">
+	<INPUT type="hidden" id="SCRIPTTOOLS" name="SCRIPTTOOLS">
+	<INPUT type="hidden" id="SCRIPTPRIMARY" name="SCRIPTPRIMARY">
 	<INPUT type="hidden" id="REPORTWRITER" name="REPORTWRITER">
 	<INPUT type="hidden" id="TOOLS" name="TOOLS">
 	<INPUT type="hidden" id="PRIMARY" name="PRIMARY">
+	<INPUT type="hidden" id="INDUSTRY" name="INDUSTRY">
+	<INPUT type="hidden" id="SOURCES" name="SOURCES">
 	<INPUT TYPE="submit" id="SUBMIT" VALUE="Submit" DISABLED="TRUE">
-	  <SPAN ID="DIVTHANKS" STYLE="display:none"><B><I>Thank you!</I></B><BR></SPAN>
+
+
+	<SPAN ID="DIVTHANKS" STYLE="display:none"><B><I>Thank you!</I></B><BR></SPAN>
+<p>
+<i>&ndash; The <a href="http://www.eclipse.org/birt/index.php?page=project/pmc.html" target="_top">BIRT</a> PMC</i>
+<p>
+
 </FORM>
 </td></tr>
 </table>
diff --git a/survey/submit.php b/survey/submit.php
index 13458d2..ecc78d3 100644
--- a/survey/submit.php
+++ b/survey/submit.php
@@ -10,16 +10,63 @@
 // line.
 
 $line = "\"$$$\",\"" . date("Y-m-d G:i:s" ) . "\"";
-$fields = array( "LANGUAGE","DEV","IDE","REPORTWRITER","TOOLS","PRIMARY" );
+$fields = array( "LANGUAGE","DEV","IDE","SCRIPTTOOLS", "SCRIPTPRIMARY", "REPORTWRITER","TOOLS","PRIMARY", "INDUSTRY", "SOURCES" );
+$keys = array_keys($_POST);
+
+$script_tools = array("NONE", "JAVASCRIPT", "PERL", "PHP", "PYTHON", "RUBY", "OTHER");
+$tools        = array("BIRT", "CRYSTAL", "JASPER", "JSP", "JFREE", "JREPORTS", "REPORTNET", "STYLE", "OTHER");
+
+
 //echo print_r( $_POST );
+//print("<BR><BR>");
+//print_r($keys);
+
+$i = 0;
 foreach ( $fields as $field )
 {
-	$line .= ",\"" . $_POST[ $field ] . "\"";
+	$mod_line = "";
+
+	if($keys[$i] == "SCRIPTTOOLS") {
+		//print("<BR><BR>");
+		//print_r("Script Tools Key = " . $keys[$i] . " =====>> " . $_POST[$keys[$i]]);
+
+		foreach($script_tools as $script_tool) {		
+			if(strstr($_POST[$keys[$i]], $script_tool) == FALSE) {
+				$mod_line .= ",\"N\"";
+			} else {
+				$mod_line .= ",\"Y\"";
+			}
+		}
+		//print("<BR>mod_line = " . $mod_line . "<br>");
+		$line .= $mod_line;
+	} else if ($keys[$i] == "TOOLS") {
+		//print("<BR><BR>");
+		//print_r("Script Tools Key = " . $keys[$i] . " =====>> " . $_POST[$keys[$i]]);
+
+		foreach($tools as $tool) {		
+			if(strstr($_POST[$keys[$i]], $tool) == FALSE) {
+				$mod_line .= ",\"N\"";
+			} else {
+				$mod_line .= ",\"Y\"";
+			}
+		}
+		//print("<BR>mod_line = " . $mod_line . "<br>");
+		$line .= $mod_line;
+	} else {
+		$line .= ",\"" . $_POST[ $field ] . "\"";
+	}
+	
+	$i = $i + 1;
 }
+
+//print("<BR><BR>");
+
 $line .= "\n";
+
 //print "<br>\nLine: $line<br>\n";
 
 ignore_user_abort(true);
+
 $f = fopen( "../writable/results.csv", "a+t" );
 if ( ! $f )
 {
@@ -28,7 +75,7 @@
 }
 flock( $f, LOCK_EX );
 
-// In case some other script has appended to the file while we were 
+// In case some other script has appended to the file while we were
 // waiting on flock()...
 
 fseek($f,0,SEEK_END);
@@ -58,8 +105,8 @@
 <img SRC="/birt/images/gradient.jpg" BORDER=0 height="53" width=282>
 </td>
 <td WIDTH="250" align="right" valign="center">
-<a href="/birt" class="birt">
-		    
+<a href="http://www.eclipse.org/birt" class="birt">
+
 <!-- Temporary BIRT header -->
 <span style="color: #E8E8FF; font-family: arial, sans-serif;
       font-size: 20px; font-weight: bold; padding-right: 20pt">
diff --git a/tutorial/basic/customers.rptdesign b/tutorial/basic/customers.rptdesign
index 593c48b..bd302f8 100644
--- a/tutorial/basic/customers.rptdesign
+++ b/tutorial/basic/customers.rptdesign
@@ -1,51 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Written by Eclipse BIRT 1.0 -->
-<report xmlns=" http://www.eclipse.org/birt/2005/design" version="1">
+<report xmlns="http://www.eclipse.org/birt/2005/design" version="3" id="1">
     <property name="createdBy">Eclipse BIRT Designer Version 1.0.0 Build &lt;20050405-1230></property>
     <property name="units">in</property>
     <data-sources>
-        <oda-data-source name="Sample">
-            <property name="driverName">sampledb</property>
-        </oda-data-source>
+        <oda-data-source extensionID="org.eclipse.birt.report.data.oda.sampledb" name="Sample" id="11"/>
     </data-sources>
     <data-sets>
-        <oda-data-set name="Customers">
+        <oda-data-set extensionID="org.eclipse.birt.report.data.oda.jdbc.JdbcSelectDataSet" name="Customers" id="12">
             <property name="dataSource">Sample</property>
             <property name="queryText">SELECT *
 FROM CUSTOMERS
 WHERE COUNTRY = 'USA'</property>
-            <property name="type">JdbcSelectDataSet</property>
         </oda-data-set>
     </data-sets>
     <styles>
-        <style name="report">
+        <style name="report" id="2">
             <property name="fontFamily">sans-serif</property>
         </style>
-        <style name="label"/>
-        <style name="text"/>
-        <style name="data"/>
-        <style name="table"/>
-        <style name="grid"/>
-        <style name="list"/>
-        <style name="image"/>
-        <style name="Header">
+        <style name="label" id="3"/>
+        <style name="text" id="4"/>
+        <style name="data" id="5"/>
+        <style name="table" id="6"/>
+        <style name="grid" id="7"/>
+        <style name="list" id="8"/>
+        <style name="image" id="9"/>
+        <style name="Header" id="10">
             <property name="backgroundColor">#0080FF</property>
             <property name="fontWeight">bold</property>
             <property name="color">#FFFFFF</property>
         </style>
     </styles>
     <page-setup>
-        <simple-master-page name="Simple MasterPage">
+        <simple-master-page name="Simple MasterPage" id="13">
             <page-header>
-                <grid>
+                <grid id="14">
                     <property name="width">100%</property>
-                    <column/>
-                    <row>
-                        <cell>
+                    <column id="15"/>
+                    <row id="16">
+                        <cell id="17">
                             <property name="fontSize">xx-large</property>
                             <property name="fontWeight">bold</property>
                             <property name="textAlign">center</property>
-                            <text>
+                            <text id="18">
                                 <text-property name="content"><![CDATA[Title]]></text-property>
                             </text>
                         </cell>
@@ -53,20 +50,20 @@
                 </grid>
             </page-header>
             <page-footer>
-                <grid>
+                <grid id="19">
                     <property name="width">100%</property>
-                    <column/>
-                    <column/>
-                    <row>
-                        <cell>
-                            <text>
+                    <column id="20"/>
+                    <column id="21"/>
+                    <row id="22">
+                        <cell id="23">
+                            <text id="24">
                                 <property name="contentType">html</property>
                                 <text-property name="content"><![CDATA[<value-of>new Date()</value-of>]]></text-property>
                             </text>
                         </cell>
-                        <cell>
+                        <cell id="25">
                             <property name="textAlign">right</property>
-                            <text>
+                            <text id="26">
                                 <text-property name="content"><![CDATA[Page:]]></text-property>
                             </text>
                         </cell>
@@ -76,29 +73,29 @@
         </simple-master-page>
     </page-setup>
     <body>
-        <grid>
+        <grid id="27">
             <property name="width">100%</property>
-            <column>
+            <column id="28">
                 <property name="width">33%</property>
             </column>
-            <column>
+            <column id="29">
                 <property name="width">33%</property>
                 <property name="textAlign">center</property>
             </column>
-            <column>
+            <column id="30">
                 <property name="width">33%</property>
                 <property name="textAlign">right</property>
             </column>
-            <row>
+            <row id="31">
                 <property name="verticalAlign">top</property>
-                <cell>
-                    <image>
-                        <expression name="uri">http://www.eclipse.org/birt/tutorial/multichip-4.jpg</expression>
+                <cell id="32">
+                    <image id="33">
+                        <expression name="uri">"http://www.eclipse.org/birt/tutorial/basic/multichip-4.jpg"</expression>
                     </image>
                 </cell>
-                <cell>
+                <cell id="34">
                     <property name="verticalAlign">top</property>
-                    <text>
+                    <text id="35">
                         <property name="contentType">html</property>
                         <text-property name="content"><![CDATA[<CENTER>
 <FONT size="6" color=blue>
@@ -109,9 +106,9 @@
 </CENTER>]]></text-property>
                     </text>
                 </cell>
-                <cell>
+                <cell id="36">
                     <property name="verticalAlign">top</property>
-                    <data>
+                    <data id="37">
                         <structure name="dateTimeFormat">
                             <property name="category">Long Date</property>
                             <property name="pattern">Long Date</property>
@@ -120,14 +117,14 @@
                     </data>
                 </cell>
             </row>
-            <row>
+            <row id="38">
                 <property name="height">0.25in</property>
-                <cell/>
-                <cell/>
-                <cell/>
+                <cell id="39"/>
+                <cell id="40"/>
+                <cell id="41"/>
             </row>
         </grid>
-        <table name="table1">
+        <table name="table1" id="42">
             <property name="borderBottomColor">#000000</property>
             <property name="borderBottomStyle">solid</property>
             <property name="borderBottomWidth">medium</property>
@@ -147,110 +144,110 @@
                     <expression name="key">row["CUSTOMERNAME"]</expression>
                 </structure>
             </list-property>
-            <column>
+            <column id="88">
                 <property name="width">1.208in</property>
             </column>
-            <column>
+            <column id="89">
                 <property name="width">1.197in</property>
             </column>
-            <column>
+            <column id="90">
                 <property name="width">2.114in</property>
             </column>
-            <column>
+            <column id="91">
                 <property name="width">1.635in</property>
             </column>
             <header>
-                <row>
-                    <cell>
-                        <label>
+                <row id="43">
+                    <cell id="44">
+                        <label id="45">
                             <property name="style">Header</property>
                             <text-property name="text">State</text-property>
                         </label>
                     </cell>
-                    <cell>
-                        <label>
+                    <cell id="46">
+                        <label id="47">
                             <property name="style">Header</property>
                             <text-property name="text">City</text-property>
                         </label>
                     </cell>
-                    <cell>
-                        <label>
+                    <cell id="48">
+                        <label id="49">
                             <property name="style">Header</property>
                             <text-property name="text">Name</text-property>
                         </label>
                     </cell>
-                    <cell>
-                        <label>
+                    <cell id="50">
+                        <label id="51">
                             <property name="style">Header</property>
                             <text-property name="text">Phone</text-property>
                         </label>
                     </cell>
                 </row>
             </header>
-            <group>
+            <group id="52">
                 <expression name="keyExpr">row["STATE"]</expression>
                 <header>
-                    <row>
+                    <row id="53">
                         <property name="backgroundColor">#BBDDFF</property>
-                        <cell>
-                            <data>
+                        <cell id="54">
+                            <data id="55">
                                 <property name="fontSize">large</property>
                                 <property name="fontWeight">bold</property>
                                 <expression name="valueExpr">row["STATE"]</expression>
                             </data>
                         </cell>
-                        <cell/>
-                        <cell/>
-                        <cell/>
+                        <cell id="56"/>
+                        <cell id="57"/>
+                        <cell id="58"/>
                     </row>
                 </header>
                 <footer>
-                    <row>
-                        <cell/>
-                        <cell/>
-                        <cell/>
-                        <cell/>
+                    <row id="59">
+                        <cell id="60"/>
+                        <cell id="61"/>
+                        <cell id="62"/>
+                        <cell id="63"/>
                     </row>
                 </footer>
             </group>
-            <group>
+            <group id="64">
                 <property name="interval">none</property>
                 <property name="sortDirection">asc</property>
                 <expression name="keyExpr">row["CITY"]</expression>
                 <header>
-                    <row>
-                        <cell/>
-                        <cell>
-                            <data>
+                    <row id="65">
+                        <cell id="66"/>
+                        <cell id="67">
+                            <data id="68">
                                 <property name="fontSize">large</property>
                                 <property name="color">#0080FF</property>
                                 <expression name="valueExpr">row["CITY"]</expression>
                             </data>
                         </cell>
-                        <cell/>
-                        <cell/>
+                        <cell id="69"/>
+                        <cell id="70"/>
                     </row>
                 </header>
                 <footer>
-                    <row>
-                        <cell/>
-                        <cell/>
-                        <cell/>
-                        <cell/>
+                    <row id="71">
+                        <cell id="72"/>
+                        <cell id="73"/>
+                        <cell id="74"/>
+                        <cell id="75"/>
                     </row>
                 </footer>
             </group>
             <detail>
-                <row>
-                    <cell/>
-                    <cell/>
-                    <cell>
-                        <data>
+                <row id="76">
+                    <cell id="77"/>
+                    <cell id="78"/>
+                    <cell id="79">
+                        <data id="80">
                             <expression name="valueExpr">row["CUSTOMERNAME"]</expression>
                         </data>
                     </cell>
-                    <cell>
-                        <data>
+                    <cell id="81">
+                        <data id="82">
                             <structure name="stringFormat">
                                 <property name="category">Custom</property>
                                 <property name="pattern">(@@@)@@@-@@@@</property>
@@ -261,11 +258,11 @@
                 </row>
             </detail>
             <footer>
-                <row>
-                    <cell/>
-                    <cell/>
-                    <cell/>
-                    <cell/>
+                <row id="83">
+                    <cell id="84"/>
+                    <cell id="85"/>
+                    <cell id="86"/>
+                    <cell id="87"/>
                 </row>
             </footer>
         </table>
diff --git a/whatsnew.html b/whatsnew.html
index 0037be2..0884268 100644
--- a/whatsnew.html
+++ b/whatsnew.html
@@ -9,10 +9,46 @@
 <p class="head">BIRT Project</p>
 <p class="subhead">What's New</p>
 
+<h1>2006</h1>
+
+<dl class="date-list">
+<dt>January 22</dt>
+<dd><a href="http://download.eclipse.org/birt/downloads">BIRT 2.0</a>
+is now available for download.  Read about the feature set at <a href="project/notable2.0.html">Notable Features - BIRT 2.0</a> </dd>
+
+<dt>January 16</dt>
+<dd><a href="http://www.eclipse.org/birt/index.php?page=project/pmc.html">The BIRT PMC</a> is pleased to announce 
+that Mike Fox, from IBM / Rational, has joined the Committee.</dd>
+
+<dt>January 4</dt>
+<dd><a href="http://download.eclipse.org/birt/downloads">BIRT 2.0 Release Candidate</a>
+is available for download.</dd>
+</dl>
+
 <h1>2005</h1>
 
 <dl class="date-list">
 
+<dt>December 7</dt>
+<dd><a href="http://download.eclipse.org/birt/downloads">BIRT 2.0 Milestone 3</a>
+can now be downloaded.  Read about the feature set at <a href="project/notable2.0M3.html">Notable Features - BIRT 2.0 M3</a> </dd>
+
+<dt>November 3</dt>
+<dd><a href="http://download.eclipse.org/birt/downloads/examples/misc/BIRT/BIRT_demo_Camv3.html" target="_blank" class="top">A new BIRT Demo</a> is available for viewing.</dd>
+
+
+<dt>October 31</dt>
+<dd><a href="http://download.eclipse.org/birt/downloads">BIRT 2.0 Milestone 2</a>
+is available for download.  Read about the feature set at <a href="project/notable2.0M2.html">Notable Features - BIRT 2.0 M2</a> </dd>
+
+<dt>October 21</dt>
+<dd><a href="examples">New Examples</a> The examples have been restructured and many new examples are available.
+</dd>
+
+<dt>October 21</dt>
+<dd><a href="project/PlanAndDeliverables.html">New Project Plan Page</a> This page contains information on the project plan and
+the milestone dates for BIRT 2.0.  In addition the page contains bugzilla queries for feature and bug fixes for each milestone.
+</dd>
 
 <dt>Setptember 30</dt>
 <dd><a href="project/project_plan_R2_0_0_Draft.html">BIRT Release 2.0 DRAFT Project Plan</a> Take a look at the projects<br>
diff --git a/wiki/cookbook/comments.php b/wiki/cookbook/comments.php
index 8a88ddc..e16aa11 100644
--- a/wiki/cookbook/comments.php
+++ b/wiki/cookbook/comments.php
@@ -34,7 +34,7 @@
 

 // feel free to choose :)

 # InitComments();

-InitCommentsStyled();

+# InitCommentsStyled();

 

 // Initializes $RecentComments array.

 if( !isset($RecentComments) ) {

@@ -46,7 +46,7 @@
 }

 

 // thought it'd be better here

-BasicCommentSetup();

+#BasicCommentSetup();

 

 // Initializes structures with plain content

 function InitComments() {

@@ -79,7 +79,7 @@
 		<input type='submit' name='delete' value=' $[Delete] ' onclick='javascript:text.value=\"\";' />

 		<input type='button' value=' $[Reset] ' onclick='javascript:text.value=\"\"; uid.value=\"0\"'/>

 	");

-	SDV($CommentsFooterFmt, "wiki:$[PmWiki.CommentsFooter]");

+	SDV($CommentsFooterFmt, "wiki:$[PmWikiFooter]");

 }

 

 // Initializes structures with styled content

@@ -112,7 +112,7 @@
 		<input type='submit' name='delete' value=' $[Delete] ' onclick='javascript:text.value=\"\";' />

 		<input type='button' value=' $[Reset] ' onclick='javascript:text.value=\"\"; uid.value=\"0\"'/>

 	");

-	SDV($CommentsFooterFmt, "wiki:$[PmWiki.CommentsFooter]");

+	SDV($CommentsFooterFmt, "wiki:$[PmWikiFooter]");

 }

 

 // aquires special params (uid & text) and initializes buttons.

@@ -206,7 +206,7 @@
 // Then do so :)

 function CommentsFileName($pagename) {

 	global $WorkDir;

-	return $WorkDir.'/'.$pagename.".Comments";

+	return $WorkDir.'/'.$pagename."Save";

 }

 // Creates/updates/deletes comments

 function HandlePostComment( $pagename ) {