Updated website to use new Phoenix templates and include new M4 information
diff --git a/.project b/.project
deleted file mode 100644
index a829423..0000000
--- a/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bpel</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/_boot.php b/_boot.php
index 31cda7e..c17de1a 100644
--- a/_boot.php
+++ b/_boot.php
@@ -18,8 +18,6 @@
    	$Menu = new Menu();
    	$projectInfo = null;
    	
-   	$projectShortName = "bpel";
-   	
    	function _require ( $location ) {
    		require_once($_SERVER['DOCUMENT_ROOT'] . $location);
    	}
diff --git a/_projectCommon.php b/_projectCommon.php
index 04cb818..ed459d1 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -1,20 +1,32 @@
 <?php
-
+	$projectShortName = "bpel";
+	require_once($_SERVER['DOCUMENT_ROOT'] . "/$projectShortName/_boot.php");
+	
 	# Set the theme for your project's web pages.
 	# See the Committer Tools "How Do I" for list of themes
 	# https://dev.eclipse.org/committers/
 	# Optional: defaults to system theme 
-	$theme = "Nova";
+	$theme = "";
 
 	# Define your project-wide Nav bars here.
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
 	# these are optional
-	$Nav->addNavSeparator("Project Home", "/bpel/index.php");
-	$Nav->addCustomNav("Downloads", "/bpel/downloads.php", "_self", 2);
-	$Nav->addCustomNav("Installation", "/bpel/install.php", "_self", 2);
-	$Nav->addCustomNav("Developers", "/bpel/developers.php", "_self", 2);
-	$Nav->addCustomNav("Users", "/bpel/users.php", "_self", 2);
-	# $Nav->addCustomNav("FAQ", "/bpel/faq.php", "_self", 2);		
-		
-	ob_start();
+	$Nav->addNavSeparator("Project Home", 	"/$projectShortName/index.php");
+	$Nav->addCustomNav("Downloads", 		"/$projectShortName/downloads.php", 	"_self", 2);
+	$Nav->addCustomNav("Installation", 		"/$projectShortName/install.php", 		"_self", 2);
+	$Nav->addCustomNav("Developers", 		"/$projectShortName/developers.php", "_self", 2);
+	$Nav->addCustomNav("Users", 			"/$projectShortName/users.php", "_self", 2);
+	
+	function get_include_contents($filename) {
+	    if (is_file($filename)) {
+	        ob_start();
+	        include $filename;
+	        $contents = ob_get_contents();
+	        ob_end_clean();
+	        return $contents;
+	    }
+	    return false;
+	}
+
 ?>
+<link rel="stylesheet" type="text/css" href="/<?=$projectShortName?>/style/main.css"/>
diff --git a/developers.php b/developers.php
index af76f62..4c218ba 100644
--- a/developers.php
+++ b/developers.php
@@ -1,21 +1,41 @@
-<?php
-    require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
-    	
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
+	#*****************************************************************************
+	#
+	# template.php
+	#
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
+	#
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
+	#****************************************************************************
+	
+	#
 	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "BPEL Project Developer Resources";
+	$pageTitle 		= "BPEL Designer Project";
 	$pageKeywords	= "BPEL, process, designer, developer";
 	$pageAuthor		= "BPEL Team";
 	
 	# Add page-specific Nav bars here
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>
+	$Nav->addNavSeparator("Developer Links", 	"");
+	$Nav->addCustomNav("CVS Repository", "http://dev.eclipse.org/viewcvs/indextech.cgi/org.eclipse.bpel", "_self", 3);
+	$Nav->addCustomNav("Mailing List", "http://dev.eclipse.org/mailman/listinfo/bpel-dev", "_blank", 3);
+	$Nav->addCustomNav("Enhancements", "https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;product=BPEL&amp;long_desc_type=allwordssubstr&amp;bug_file_loc_type=allwordssubstr&amp;status_whiteboard_type=allwordssubstr&amp;keywords_type=allwords&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_severity=enhancement&amp;bugidtype=include&amp;chfieldto=Now&amp;cmdtype=doit&amp;order=Bug+Number&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=", "_blank", 3);
+	$Nav->addCustomNav("Open bugs", "https://bugs.eclipse.org/bugs/buglist.cgi?query_format=specific&amp;order=relevance+desc&amp;bug_status=__open__&amp;product=BPEL", "_blank", 3);
+	$Nav->addCustomNav("Closed bugs", "https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=BPEL&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&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=", "_blank", 3);
+	
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
 
 <div id="maincontent">
 	<div id="midcolumn">
-		<div align="center"><h1>BPEL Project</h1></div>
+		<h1>$pageTitle</h1>
 		<h2>Developer Resources</h2>
 		<p>
 		To get started, we suggest that <a class="www" href="/bpel/install.php">you install</a> the bits first. The installation instructions 
@@ -29,7 +49,7 @@
 		<ul class="midlist">
 		 <li><span class="focus">QA</span> - if you are using the BPEL designer and found a bug <a class="www" href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=BPEL">report it.</a>
 		 <li><span class="focus">Extension Points</span> - Some of you have extended the BPEL editor to do <b>X</b>.
-		 Consider contributing this back or at least share that little nuggest with us.  We'll add it to
+		 Consider contributing this back or at least share that little nugget with us.  We'll add it to
 		 the "interesting" links, "interesting" links side bar.
 		 <li> <span class="focus">Runtimes</span> - Apache ODE integration - we are thinking about this,
 		  but if you have some spare cycles perhaps you could write it.
@@ -42,10 +62,8 @@
 		If you are interested, just contact the <a class="www" href="/bpel/team.php">BPEL Team</a>.
 		</p>
 		
-		</p>
 		
-		
-		<div class="homeitem">
+		<div class="homeitem3col">
 			<h3>Design Documents</h3>
 			<ul>
 				<li><a class="www" href="developers/validator/">BPEL 2.0 Validator</a>  <span class="date">Mar 29<sup>th</sup>,2007</span></li>
@@ -53,7 +71,7 @@
 				<li><a class="www" href="developers/extension_points.php">Extension Points</a>  <span class="date">Dec 2<sup>nd</sup> 2005</span></li>
 			</ul>
 		</div>
-		<div class="homeitem">
+		<div class="homeitem3col">
 			<h3>Planning</h3>
 			<ul>
 				<li><a class="www" href="developers/milestone_plan.php">Milestone Plan</a>  <span class="date">Aug 7<sup>th</sup>, 2007</span></li>
@@ -65,7 +83,7 @@
 			</ul>
 		</div>
 		<hr class="clearer" />
-		<div class="homeitem">
+		<div class="homeitem3col">
 			<h3>Other Misc</h3>
 			<ul>
 				<li><a class="www" href="developers/www.php">How to add web content</a> (w.e.o/bpel/)</li>
@@ -73,14 +91,32 @@
 		</div>
 		
 	</div>
+	
 	<div id="rightcolumn">
+    	<div class="sideitem">
+       		<h6>Incubation</h6><p>
+       		<div align="center">
+        		<a href="/projects/what-is-incubation.php">
+           		<img align="center" src="/images/egg-incubation.png" border="0"/></a>
+       		</div>
+       		<div align="center">  
+         		This project is in the 
+         		<a href="/projects/dev_process/validation-phase.php">Incubation Phase</a>
+       		</div>
+     	</div>
 		<div class="sideitem">
-		    <?php include("items/project_links.html"); ?>
+			<h6>links</h6>
+			<ul>
+				<li><a href="http://download.eclipse.org/technology/bpel/update-site/" target="download">BPEL Editor Update Site</a></li>
+			</ul>
 		</div>
-		<div class="sideitem">
-		    <?php include("items/external_links.html") ?>
-		</div>
-	</div>
+     </div>
 </div>
 
-<?php bpel_generate_page() ?>
+
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/developers/validator/index.php b/developers/validator/index.php
index 4a98424..5d98897 100644
--- a/developers/validator/index.php
+++ b/developers/validator/index.php
@@ -1,11 +1,18 @@
-<?php
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
 	#*****************************************************************************
-	# milestone_plan.php
-	# Author: 		BPEL Team
-	# Description: Milestones.
+	#
+	# template.php
+	#
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
+	#
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
 	#****************************************************************************
 	
+	#
 	# Begin: page-specific settings.  Change these. 
 	$pageTitle 		= "BPEL Validator";
 	$pageKeywords	= "BPEL, process, designer, milestone,validator";
@@ -13,19 +20,24 @@
 	
 	# Add page-specific Nav bars here
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>
-
-<div id="rightcolumn">
-   <?php include("../../items/links.html"); ?>
-</div>
-
+	# $Nav->addNavSeparator("Interesting Links", 	"");
+	# $Nav->addCustomNav("Scientific Workflows using BPEL", "http://sse.cs.ucl.ac.uk/index.php?id=omii-bpel", "_blank", 1);
+	# $Nav->addCustomNav("WS-BPEL 2.0", "http://docs.oasis-open.org/wsbpel/2.0/wsbpel-v2.0.html", "_blank", 1);
+	# $Nav->addCustomNav("OASIS TC", "http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsbpel", "_blank", 1);
+	
+	# End: page-specific settings
+	#
+	$Runner_java_html=get_include_contents('Runner.java.html');
+	$ARule_java_html=get_include_contents('ARule.java.html');
+	$VariableValidator_java_html=get_include_contents("VariableValidator.java.html");
+ 	$IFactory_java_html=get_include_contents("IFactory.java.html");
+	
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
 <div id="maincontent">
 		
 	<div id="midcolumn">
-		<h1><?=$pageTitle?></h1>
+		<h1>$pageTitle</h1>
 		
    <p>	
 The BPEL validator is designed to validate BPEL 2.0 source files. In addition
@@ -104,7 +116,7 @@
 be included here. Take a look at <tt>org.eclipse.bpel.validator.model.Runner</tt>
 
 <pre class="java" style="height: 200px;">
-<?php include("Runner.java.html") ?>
+$Runner_java_html
 </pre>
 </p>
 
@@ -173,14 +185,14 @@
 The full rule annotation is shown below. The other fields of the annotation are used for generating
 completeness documentation from the validator code.
 <pre class="java" style="height: 100px; overflow: auto;">
-<?php include("ARule.java.html") ?>
+$ARule_java_html
 </pre> 
 
 A <tt>VariableValidator</tt> segment is shown below. Here we check to make sure that a variable 
 has at least a messageType, type, or element set. There is a rule to check the NCName of the variable
 (no dots) and a rule to check the message type. 
 <pre class="java" style="height: 250px; overflow: auto;">
-<?php include("VariableValidator.java.html") ?>
+$VariableValidator_java_html
 </pre>
  
  
@@ -199,7 +211,7 @@
  interface, which is again very trivial. <tt>null</tt> should be returned if the factory does
  not supply validators for the given namespace.
  <pre class="java" style="height: 150px;">
- <?php include("IFactory.java.html"); ?>
+ $IFactory_java_html
  </pre> 
  </li>
  
@@ -220,4 +232,10 @@
 
 </div>
 
-<?php bpel_generate_page() ?>
+
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/developers/validator/sa.php b/developers/validator/sa.php
index 0a134ab..2fc23e7 100644
--- a/developers/validator/sa.php
+++ b/developers/validator/sa.php
@@ -1,11 +1,18 @@
-<?php
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
 	#*****************************************************************************
-	# milestone_plan.php
-	# Author: 		BPEL Team
-	# Description: Milestones.
+	#
+	# template.php
+	#
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
+	#
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
 	#****************************************************************************
 	
+	#
 	# Begin: page-specific settings.  Change these. 
 	$pageTitle 		= "BPEL Validator Rules";
 	$pageKeywords	= "BPEL, process, designer, milestone,validator";
@@ -13,10 +20,19 @@
 	
 	# Add page-specific Nav bars here
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>
+	# $Nav->addNavSeparator("Interesting Links", 	"");
+	# $Nav->addCustomNav("Scientific Workflows using BPEL", "http://sse.cs.ucl.ac.uk/index.php?id=omii-bpel", "_blank", 1);
+	# $Nav->addCustomNav("WS-BPEL 2.0", "http://docs.oasis-open.org/wsbpel/2.0/wsbpel-v2.0.html", "_blank", 1);
+	# $Nav->addCustomNav("OASIS TC", "http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsbpel", "_blank", 1);
+	
+	# End: page-specific settings
+	#
+	$rules_html=get_include_contents("rules.html");
+	 
+	
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
+
 
 <div id="rightcolumn">
    <?php include("../../items/links.html"); ?>
@@ -25,14 +41,20 @@
 <div id="maincontent">
 		
 	<div id="midcolumn">
-		<h1><?=$pageTitle?></h1>
+		<h1>$pageTitle</h1>
      
 	<p style="margin-top: 50px;">
-	<?php include ("rules.html") ?> 
+	$rules_html 
 	</p>
 	
 	</div>
 	
 </div>
 
-<?php bpel_generate_page() ?>
+
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/downloads.php b/downloads.php
index a0e6087..713f046 100644
--- a/downloads.php
+++ b/downloads.php
@@ -1,22 +1,38 @@
-<?php  			
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
+	#*****************************************************************************
+	#
+	# template.php
+	#
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
+	#
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
+	#****************************************************************************
 	
-	ob_start();
+	#
 	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "BPEL Project downloads";
+	$pageTitle 		= "BPEL Designer Project";
 	$pageKeywords	= "BPEL, process, designer, download";
 	$pageAuthor		= "BPEL Team";
 	
 	# Add page-specific Nav bars here
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
+	# $Nav->addNavSeparator("Interesting Links", 	"");
 	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
 	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>		
+
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
 
 <div id="maincontent">
 	<div id="midcolumn">
-		<div align="center"><h1>BPEL Project</h1></div>
+		<h1>$pageTitle</h1>
 		<h2>Downloads</h2>
 		<p>We have activated a download site for the Eclipse BPEL designer. The update site contains all
 		the other plugins and libraries needed by the designer. 
@@ -28,18 +44,33 @@
 		The build available on the update site currently (as of <b>May 08, 2009</b>) is the <b>M4</b>
 		build (version <b>0.4.0</b>).
 		<p>
+		
 	</div>
-
-
 	<div id="rightcolumn">
-	    <?php include("items/incubation.html"); ?>     
-        <?php include("items/links.html"); ?>
-	</div>
-	
+    	<div class="sideitem">
+       		<h6>Incubation</h6><p>
+       		<div align="center">
+        		<a href="/projects/what-is-incubation.php">
+           		<img align="center" src="/images/egg-incubation.png" border="0"/></a>
+       		</div>
+       		<div align="center">  
+         		This project is in the 
+         		<a href="/projects/dev_process/validation-phase.php">Incubation Phase</a>
+       		</div>
+     	</div>
+		<div class="sideitem">
+			<h6>links</h6>
+			<ul>
+				<li><a href="http://download.eclipse.org/technology/bpel/update-site/" target="download">BPEL Editor Update Site</a></li>
+			</ul>
+		</div>
+     </div>
 </div>
 
-<?php
+
+EOHTML;
+
+
 	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle,
-	     ob_get_clean() );
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
 ?>
diff --git a/faq.php b/faq.php
deleted file mode 100644
index ded34b8..0000000
--- a/faq.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-    require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
-   	ob_start();
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "BPEL Project FAQ";
-	$pageKeywords	= "BPEL, process, designer, FAQ";
-	$pageAuthor		= "BPEL Team";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-
-	# End: page-specific settings
-	#
-?>		
-<div id="maincontent">
-	<div id="midcolumn">
-		<div align="center"><h1>BPEL Project</h1></div>
-		<h2>FAQ</h2>
-		<p></p>
-		<div class="homeitem3col">
-			<h3>Questions</h3>
-			<ul>
-				<li><a href="#1">1) Why aren't our users asking questions?</a></li>
-				<li><a href="#2">2) Can I ask you a question?</a></li>
-			</ul>
-		</div>
-		<div class="homeitem3col">
-			<h3>Answers</h3>
-			<ul>
-				<li><a name="1">1) Why are you so worried?</a></li>
-				<li><a name="2">2) Definitely!</a></li>
-			</ul>
-		</div>
-		<hr class="clearer" />
-	</div>
-	<div id="rightcolumn">
-		<div class="sideitem">
-			<h6>Links</h6>
-			<ul>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<?php
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle,
-	     ob_get_clean() );
-?>
diff --git a/images/.cvsignore b/images/.cvsignore
deleted file mode 100644
index 085e8ba..0000000
--- a/images/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/images/community.jpg b/images/community.jpg
new file mode 100755
index 0000000..7ad0c83
--- /dev/null
+++ b/images/community.jpg
Binary files differ
diff --git a/images/conductor-3.jpg b/images/conductor-3.jpg
new file mode 100644
index 0000000..f276c6a
--- /dev/null
+++ b/images/conductor-3.jpg
Binary files differ
diff --git a/images/conductor-4.jpg b/images/conductor-4.jpg
new file mode 100644
index 0000000..1614b80
--- /dev/null
+++ b/images/conductor-4.jpg
Binary files differ
diff --git a/images/conductor.jpg b/images/conductor.jpg
new file mode 100644
index 0000000..919d8b7
--- /dev/null
+++ b/images/conductor.jpg
Binary files differ
diff --git a/images/downloads.gif b/images/downloads.gif
new file mode 100755
index 0000000..5a37f3a
--- /dev/null
+++ b/images/downloads.gif
Binary files differ
diff --git a/images/mail.gif b/images/mail.gif
deleted file mode 100644
index 494c6d4..0000000
--- a/images/mail.gif
+++ /dev/null
Binary files differ
diff --git a/images/outline.png b/images/outline.png
deleted file mode 100644
index 77013db..0000000
--- a/images/outline.png
+++ /dev/null
Binary files differ
diff --git a/images/rarrow.png b/images/rarrow.png
new file mode 100644
index 0000000..d43a350
--- /dev/null
+++ b/images/rarrow.png
Binary files differ
diff --git a/images/reference.png b/images/reference.png
new file mode 100644
index 0000000..6d8e117
--- /dev/null
+++ b/images/reference.png
Binary files differ
diff --git a/images/screenshot.png b/images/screenshot.png
deleted file mode 100644
index e974b4f..0000000
--- a/images/screenshot.png
+++ /dev/null
Binary files differ
diff --git a/images/www.png b/images/www.png
deleted file mode 100644
index 419c06f..0000000
--- a/images/www.png
+++ /dev/null
Binary files differ
diff --git a/index.php b/index.php
index 3351e24..d526218 100644
--- a/index.php
+++ b/index.php
@@ -1,129 +1,162 @@
-<?php 	
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
+	#*****************************************************************************
+	#
+	# template.php
+	#
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
+	#
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
+	#****************************************************************************
 	
-   	# All on the same line to unclutter the user's desktop'	
 	#
 	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "BPEL Project home";
-	$pageKeywords	= "BPEL, process, designer";
+	$pageTitle 		= "BPEL Designer Project";
+	$pageKeywords	= "BPEL, SOA, WSDL, Eclipse";
 	$pageAuthor		= "BPEL Team";
 	
 	# Add page-specific Nav bars here
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>
+	$Nav->addNavSeparator("Interesting Links", 	"");
+	$Nav->addCustomNav("Scientific Workflows using BPEL", "http://sse.cs.ucl.ac.uk/index.php?id=omii-bpel", "_blank", 1);
+	$Nav->addCustomNav("WS-BPEL 2.0", "http://docs.oasis-open.org/wsbpel/2.0/wsbpel-v2.0.html", "_blank", 1);
+	$Nav->addCustomNav("OASIS TC", "http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsbpel", "_blank", 1);
+	
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
+
 
 <div id="maincontent">
 	<div id="midcolumn">
-		<div align="center"><h1>BPEL Project</h1></div>
-
-		<table border="0" cellpadding="4">
-          <tr>
-          	<td valign="top"><a href="images/screenshot.png"><img border=0 src="images/outline.png" alt="Outline"/></a>
-				<div align="center"><font size="1" >(click on the picture for a screenshot)</font></div>
-			</td>
-          	<td valign="top">&nbsp;</td>
-            <td valign="top">
+		<h1>$pageTitle</h1>
+		<table border="0" cellpadding="3" width=100%>
+			<tr>
+				<tr>
+					<td height=100>
+						<a align="top" href="/$projectShortName/users.php">
+							<img border=0 src="images/reference.png">
+						</a>
+					</td>
+					<td>
+						<p class="topic"><a href="/$projectShortName/users.php">Read The Documentation!</a></p>
+						<p class="subline">Read papers, articles and presentations, browse the <a href="http://wiki.eclipse.org/BPEL">wiki pages</a>.</p>
+					</td>
+					<td rowspan=3 align=right>
+						<img height="200" src=images/conductor-4.jpg>
+					</td>
+				</tr>
+				<tr>
+					<td height=100>
+						<a href="/$projectShortName/downloads.php">
+							<img border=0 src="images/downloads.gif">
+						</a>
+					</td>
+					<td>
+						<p class="topic"><a href="/$projectShortName/downloads.php">Try it out!</a></p>
+						<p class="subline">Try the latest milestone and see how it works.</p>
+					</td>
+				</tr>
+				<tr>
+					<td height=100>
+						<a href="/$projectShortName/developers.php">
+							<img border=0 src="images/community.jpg">
+						</a>
+					</td>
+					<td>
+						<p class="topic"><a href="/$projectShortName/developers.php">Get involved!</a></p>
+						<p class="subline">
+							Get in touch with the community: Join the <a href="https://dev.eclipse.org/mailman/listinfo/bpel-dev">mailing list</a>,
+							browse the <a href="http://www.eclipse.org/newsportal/thread.php?group=eclipse.technology.bpel-designer">newsgroup</a>,
+							check <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=BPEL">Bugzilla</a></p>
+					</td>
+				</tr>
+				<tr height=11>
+				</tr>
+		</table>
+		
+		<div class="homeitem3col">
+			<h3>What is BPEL Designer?</h3>
+			<p>
 				The goal of the BPEL Project is to add comprehensive support to Eclipse for the definition,
 				authoring, editing, deploying, testing and debugging of WS-BPEL 2.0 processes. WS-BPEL (Web Services Business Process Execution Language), 
 				or BPEL, is a vendor-neutral specification being developed by OASIS to specify business processes as a set of interactions between web 
 				services. By providing these tools, this project aims to build a community around support for BPEL in Eclipse.
-				<br/>
-				The key pieces of functionality that will be provided are:
-     			<ul>
-					<li><b>Designer</b>. A GEF-based editor that provides a graphical means to author BPEL processes.</li>
-					<li><b>Model</b>. An EMF model that represents the WS-BPEL 2.0 specification.</li>
-					<li><b>Validation</b>. A validator which operates on the EMF model and produces errors and warnings based on the specification.</li>
-					<li><b>Runtime Framework</b>. An extensible framework which will allow for deployment and execution of BPEL processes from the tools into a BPEL engine.</li>
-					<li><b>Debug</b>. A framework which will allow the user to step through the execution of a process, including support for breakpoints.</li>
-	    		</ul>			
-		  	</td>
-          </tr>
-        </table>
-        
-<p>
-The implementation will be extensible to third-party vendors in a number of ways. The editor will be
-extensible to support new activity types, property pages for extensibility of existing constructs,
-an extensible palette, and product-specific branding capabilities. The runtime deployment framework
-will be extensible so that third parties may add support for a variety of runtime engines. The model
-will support extensions to provide new activities or attributes, and the validator will allow for
-validation of these extensions.
-</p>
-<p>
-While the key pieces for a 1.0 release are identified above, we welcome suggestions of additional areas
-in which this project could participate. Anyone who has ideas is welcome to make comments or proposals
-to the newsgroup and assist with the evolution of the project.
-</p>
+			</p>
+		</div>
+		
+		
+		<div class="homeitem3col">
+			<h3>The Key Features</h3>
+			&nbsp;
+     		<ul>
+				<li><b>Designer</b>. A GEF-based editor that provides a graphical means to author BPEL processes.</li>
+				<li><b>Model</b>. An EMF model that represents the WS-BPEL 2.0 specification.</li>
+				<li><b>Validation</b>. A validator which operates on the EMF model and produces errors and warnings based on the specification.</li>
+				<li><b>Runtime Framework</b>. An extensible framework which will allow for deployment and execution of BPEL processes from the tools into a BPEL engine.</li>
+				<li><b>Debug</b>. A framework which will allow the user to step through the execution of a process, including support for breakpoints.</li>
+    		</ul>
+		</div>
 
-<h2>How to Participate</h2>
-<a href="install.php">Installation</a>: Instructions on how to download and install.
-<br/><br/>Feedback: 
-<ul>
-	<li>Bug reports may be logged to <a class="www" href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=BPEL">Bugzilla</a>.</li>
-	<li>The <a class="www" href="http://www.eclipse.org/newsportal/thread.php?group=eclipse.technology.bpel-designer">newsgroup</a> should be used for general discussion and questions.</li>
-	<li>The <a class="www" href="http://dev.eclipse.org/mailman/listinfo/bpel-dev">mailing list</a> should be used for development-related discussion.</li>
-</ul>
-
-<h2>Milestone Plan</h2>
-<p>
-Please see the <a class="www" href="developers/milestone_plan.php">Milestone Plan</a> for details on the scheduling of various items and release dates.
-</p>
-
-The <a class="www" href="/bpel/team.php">BPEL Team</a>.
-
-		<hr class="clearer" />
+		<div class="homeitem3col">
+			<h3>New &amp; Noteworthy</h3>
+			&nbsp;
+     		<ul>
+				<li><b>Sept. 7, 2010 &ndash; New project website is up!</b>
+				If you can read this and your browser hasn't crashed yet, life is good :)
+				</li>
+				<li><b>Sept. 1, 2010 &ndash; M4 release is available</b>
+				Check out the latest
+				<a href="http://local.eclipse.org/$projectShortName/users/m4.php">bug fixes and enhancements.</a>
+				</li>
+				</ul>
+		</div>
+		
+		<div class="homeitem3col">
+			<h3>The Prime Directive</h3>
+			<p>
+				The implementation will be extensible to third-party vendors in a number of ways. The editor will be
+				extensible to support new activity types, property pages for extensibility of existing constructs,
+				an extensible palette, and product-specific branding capabilities. The runtime deployment framework
+				will be extensible so that third parties may add support for a variety of runtime engines. The model
+				will support extensions to provide new activities or attributes, and the validator will allow for
+				validation of these extensions.
+			</p>
+			<p>
+				While the key pieces for a 1.0 release are identified above, we welcome suggestions of additional areas
+				in which this project could participate. Anyone who has ideas is welcome to make comments or proposals
+				to the newsgroup and assist with the evolution of the project.
+			</p>
+		</div>
+		
+		
 	</div>
+		
+		
 	<div id="rightcolumn">
-	
-	    <?php include("items/incubation.html"); ?>     
-	    
-	     
-		<div class="sideitem">
-			<h6>Recognition</h6>
-			<ul>
-				<li><a class="www" 
-				       target="ref" 
-				       alt="JAX 2007 4th place"
-				       href="http://jax-award.de/jax_award/gewinner_eng.php">JAX 4<sup>th</sup>Place! </a></li>
-			</ul>
-		</div>
-	     
-		<div class="sideitem">
-			<h6>Links</h6>
-			<ul>
-				<li><a class="www" 
-				       target="ref" 
-				       href="http://docs.oasis-open.org/wsbpel/2.0/wsbpel-v2.0.html">BPEL 1.1</a></li>
-				<li><a class="www" 
-				       target="ref"
-				       href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsbpel">OASIS TC</a></li>
-			</ul>
-		</div>
-		<div class="sideitem">
-			<h6>User Resources</h6>
-			<ul>
-				<li><a href="news://eclipse.org/eclipse.technology.bpel-designer">Newsgroup</a> (<a href="http://www.eclipse.org/newsportal/thread.php?group=eclipse.technology.bpel-designer">web interface</a>)</li>
-				<li><a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=BPEL">Report a bug</a></li>
-			</ul>
-		</div>
-		<!-- Useful BPEL links -->
-		<div class="sideitem">
-			<h6>Interesting BPEL places</h6>
-			<ul>
-				<li><a href="http://sse.cs.ucl.ac.uk/index.php?id=omii-bpel" 
-				       target="interesting"
-				       class="www" 
-				       >
-				       Scientific Workflows using BPEL</a></li>
-				<li><a href="http://azur.typepad.com/" target="interesting"
-					   class="www" 
-				       >				      
-				      BPEL Radio</a></li>
-			</ul>
-		</div>
+    	<div class="sideitem">
+       		<h6>Incubation</h6><p>
+       		<div align="center">
+        		<a href="/projects/what-is-incubation.php">
+           		<img align="center" src="/images/egg-incubation.png" border="0"/></a>
+       		</div>
+       		<div align="center">  
+         		This project is in the 
+         		<a href="/projects/dev_process/validation-phase.php">Incubation Phase</a>
+       		</div>
+     	</div>
 	</div>
 </div>
 
-<?php bpel_generate_page() ?>
+
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/install.php b/install.php
index 18579a4..9c369e5 100644
--- a/install.php
+++ b/install.php
@@ -1,206 +1,352 @@
-<?php
-    require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
 
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "BPEL Project installation";
-	$pageKeywords	= "BPEL, process, designer, install";
-	$pageAuthor		= "BPEL Team";
+#*****************************************************************************
+#
+# template.php
+#
+# Author: 		Denis Roy
+# Date:			2005-06-16
+#
+# Description: Type your page comments here - these are not sent to the browser
+#
+#
+#****************************************************************************
+
+#
+# Begin: page-specific settings.  Change these.
+$pageTitle 		= "BPEL Designer Project";
+$pageKeywords	= "BPEL, process, designer, install";
+$pageAuthor		= "BPEL Team";
+
+# Add page-specific Nav bars here
+# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
+# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
+# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
+# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
+
+# End: page-specific settings
+#
+
+# Paste your HTML content between the EOHTML markers!
+$html = <<<EOHTML
 	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>
-
 <div id="maincontent">
 	<div id="midcolumn">
-		<div align="center"><h1>BPEL Project</h1></div>
-
-<div class="right">
-  Last Modified: <span class="date">May 08<sup>th</sup>, 2009</span>
-</div>
-		
+		<h1>$pageTitle</h1>
 		<h2>Installation</h2>
 
 
-So, you wanna try it out ...
-	
-<div class="warning">
-  The update-site build (M4) requires version 3.4 of Eclipse [EMF 2.4.x, WST 3.0.x]   
-</div> 		
-<p>
-<b>If</b> you don't want to install everything and compile but are a curious soul, 
-then the simplest way is the 
-  <a class="www"
-     href="http://download.eclipse.org/technology/bpel/update-site/" 
-     target="download">BPEL Editor Update Site</a>.
- In order to use the Update Site, you will have to have <b>Eclipse 3.4.x</b> running and make
- sure that you can install from within Eclipse. Then follow the directions on the update site.
- <p>
- 
- 
- The update site contains dependencies that the BPEL plugins need (WTP, EMF, GEF, JEM). These
- will get installed if you don't have them. 
+		So, you wanna try it out ...
+
+		<div class="warning">
+			The update-site build (M4) requires version 3.4 of Eclipse [EMF 2.4.x, WST 3.0.x]
+		</div>
+		<p>
+			<b>If</b>
+			you don't want to install everything and compile but are a curious
+			soul,
+			then the simplest way is the
+			<a class="www" href="http://download.eclipse.org/technology/bpel/update-site/"
+				target="download">BPEL Editor Update Site</a>
+			.
+			In order to use the Update Site, you will have to have
+			<b>Eclipse 3.4.x</b>
+			running and make
+			sure that you can install from within Eclipse. Then
+			follow the
+			directions
+			on the update site.
+			<p>
+
+
+				The update site contains dependencies that the BPEL plugins need
+				(WTP,
+				EMF, GEF, JEM). These
+				will get installed if you don't have
+				them. 
  
  </p>
+		</p>
+
+		<div class="warning">
+					The instructions below are for building the current
+			<i>tip</i>
+			of the BPEL editor.
+		</div>
+
+		<b>Otherwise</b>
+
+
+		<ol>
+			<li>
+				Make sure your Target Platform includes the dependencies listed
+				below.
+				[
+				<span style="font-weight: bold;">
+					Window->Preferences->Plug-in Development->Target
+					Platform </span>
+				]
+
+				If you have the dependencies described below you can skip to
+				<a href="#step3">step 3</a>
+			</li>
+			<br/>
+			<li>
+				You need to download the following
+				dependencies.
+				<ul class="midlist">
+					<li>
+						<a class="www" target="download"
+							href="http://download.eclipse.org/downloads/index.php">Eclipse 3.4.x</a>
+						(Ganymede)
+					</li>
+					<li>
+						<a class="www" target="download"
+							href="http://www.eclipse.org/modeling/emf/downloads/?project=emf">EMF 2.4.x</a>
+					</li>
+					<li>
+						<a class="www" target="download"
+							href="http://download.eclipse.org/tools/gef/downloads/index.php">GEF 3.4.x</a>
+					</li>
+					<li>
+						<a class="www" target="download" href="http://www.eclipse.org/datatools/">DTP STK 1.6.x</a>
+					</li>
+					<li>
+						<a class="www" target="download"
+							href="http://download.eclipse.org/webtools/downloads/">WTP (Web Tools Platform) 2.0.x</a>
+					</li>
+				</ul>
+
+			<p>
+				Generally speaking, the
+				<b>.x</b>
+				extension represents the last maintenance release so get
+				the latest
+				one possible.
+			</p>
+
+			<a name="step3"></a>
+			</li>
+			<br/>
+			<li>
+
+				Check out the following plug-ins from
+				<b>:pserver:anonymous@dev.eclipse.org:/cvsroot/technology</b>
+
+				<p>
+					In folder
+					<b>org.eclipse.bpel/plugins</b>
+				</p>
+
+				<ul class="midlist">
+					<li>
+						<b>org.eclipse.bpel.common.model</b>
+					</li>
+					<li>
+						<b>org.eclipse.bpel.common.ui</b>
+						- Common UI classes are here.
+					</li>
+					<li>
+						<b>org.eclipse.bpel.model</b>
+						- The BPEL model classes generated from the EMF model, resource
+						sets, etc.
+					</li>
+					<li>
+						<b>org.eclipse.bpel.wsil.model</b>
+						- The WSIL model we use in the WSIL browser.
+					</li>
+					<li>
+						<b>org.eclipse.bpel.ui</b>
+						- The main editor code.
+					</li>
+					<li>
+						<b>org.eclipse.bpel.runtimes</b>
+						- This is what runtimes need to extend in order to plug in.
+					</li>
+					<li>
+						<b>org.eclipse.bpel.apache.ode.runtime</b>
+						- A Reference integration with the Apache ODE runtime.
+					</li>
+					<li>
+						<b>org.eclipse.bpel.apache.ode.deploy.ui</b>
+						- An Editor to create an Apache ODE deployment descriptor.
+					</li>
+					<li>
+						<b>org.eclipse.bpel.apache.ode.deploy.model</b>
+						- The EMF model for the deployment descriptor editor.
+					</li>
+					<li>
+						<b>org.eclipse.bpel.validator</b>
+						- A BPEL validator that will check the BPEL source for
+						errors.
+					</li>
+					<li>
+						<b>org.eclipse.bpel.examples.extensionPoints</b>
+						- Some examples of extension points provided by other
+						plugins
+						in
+						the BPEL editor.
+					</li>
+				</ul>
+			</li>
+				<div class="warning">
+					Note that as of M4 and Ganymede release of Eclipse,
+					the EMF models in
+					the BPEL editor are generated against WTP 2.0
+					EMF
+					models (WSDL,
+					XSD)
+					and use Java 5 compliance to generate the
+					code.
+					This means for the
+					most part that generics are used in
+					generated
+					source.
+					All the source in the BPEL editor requires at
+					least Java 1.5
+				</div>
+
+				<p>
+				If you don't know really what the above means,
+				<a href="http://dev.eclipse.org/mhonarc/lists/bpel-dev/msg00319.html">just be thankfull.</a>
+				</p>
+			<br/>
+			<li>
+				Launch a runtime workbench (a.k.a. Eclipse Application). The
+				new
+				workbench will have the
+				just installed plugins with it and it
+				just
+				ought to run them.
+			</li>
+			<br/>
+			<li>
+				In the running workbench with the BPEL plugins create a new
+				BPEL
+				project and then create a BPEL process
+				using the new BPEL file
+				wizard. You should get a skeleton of a BPEL
+				source file to work
+				with.
+				<br/>
+				<br/>
+				If you have other BPEL sources you can open them as well,
+				however,
+				they first need to be imported into
+				an eclipse project
+				which by
+				default must live in an eclipse
+				workspace. As long as the
+				BPEL
+				source
+				file
+				has 2.0 code, the editor ought to be able to open
+				it.
+			</li>
+			<br/>
+			<li>
+				Double-click on the .bpel file to open the BPEL editor.
+			</li>
+		</ol>
+		<p>
+			<h4>What does it do ? </h4>
+		</p>
+		<ul class="midlist">
+			<li>Wizard to create new BPEL files</li>
+			<li>Opens, views, edits and saves a .bpel file</li>
+			<li>Create new activities, modify their properties (in the
+				Properties view)</li>
+			<li>Supports all of BPEL 2.0 structures - some UI to modify
+				those
+				is
+				not implemented yet</li>
+			<li>File browsing dialogs, so you can browse for WSDL or XSD
+				files
+				</li>
+			<li>Has a XPath editor for building expressions and queries
+											</li>
+			<li>Has some extension points you can try implementing</li>
+			<li>Has BPEL validation</li>
+			<li>It can talk to a runtime through an add on run-time
+				plugin
+										</li>
+			<li>It can copy/cut/paste most things pretty well (to and
+				from
+				source
+				as well)</li>
+			<li>Import WSDL definitions from the WSIL browser</li>
+			<li>Edit the BPEL "source" (XML editing) in the XML tab</li>
+			<li>Initial support for abstract business processes</li>
+		</ul>
+
+		More details on that are available on the
+		<a class="www" href="users.php">
+			<i>Users</i>
+			page
+		</a>
+		. Check the Milestones entries (M1, M2, M3, M4).
+
+		<h4>What doesn't it do yet</h4>
+		<ul class="midlist">
+			<li>Full BPEL 2.0 UI support</li>
+			<li>Debug</li>
+		</ul>
+
+
+		<h4>I found a bug </h4>
+		<p>
+			We now have Bugzilla components (in the Technology Project).
+			Or
+			you
+			can enter a bug directly
+			into one of our
+			<a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Bpel">components</a>
+			.
+		</p>
+
+		<p>
+			Patches are most welcome.
 </p>
 
-<div class="warning">
-The instructions below are for building the current <i>tip</i> of the BPEL editor. 
-</div>
-
-<b>Otherwise</b> 
-
-
-<p style="counter-reset: aSectionNumber;">
-
-<span class="section section-counter section-counter-next">.</span> 
-
-Make sure your Target Platform includes the dependencies listed below. 
-[ <span style="font-weight: bold;">
- Window->Preferences->Plug-in Development->Target Platform </span> ]
-</p>
-
-If you have the dependencies described below you can skip to <a href="#step3">step 3</a>.
-
-<p>
-<span class="section section-counter section-counter-next">.</span> You need to download the following
-dependencies.
-<ul class="midlist">
-	<li><a class="www"
-	       target="download" 
-	       href="http://download.eclipse.org/downloads/index.php">Eclipse 3.4.x</a> (Ganymede)</li>
-	<li><a class="www"
-	       target="download"
-	       href="http://www.eclipse.org/modeling/emf/downloads/?project=emf">EMF 2.4.x</a></li>
-	<li><a class="www"
-	       target="download"
-	       href="http://download.eclipse.org/tools/gef/downloads/index.php">GEF 3.4.x</a></li>
-	<li><a class="www"
-	       target="download"
-	       href="http://www.eclipse.org/datatools/">DTP STK 1.6.x</a></li>
-	<li><a class="www"
-	       target="download" 
-	       href="http://download.eclipse.org/webtools/downloads/">WTP (Web Tools Platform) 2.0.x</a></li>
-</ul>
-</p>
-
-<p>
-Generally speaking, the <b>.x</b> extension represents the last maintenance release so get
-the latest one possible. 
-</p>
- 
-
-<a name="step3"></a>
-
-<span class="section section-counter section-counter-next">.</span> 
-
-Check out the following plug-ins from 
-<b>:pserver:anonymous@dev.eclipse.org:/cvsroot/technology</b>
-</p>
-
-<p>
-In folder <b>org.eclipse.bpel/plugins</b>
-</p>
-
-<ul class="midlist">
-	<li><b>org.eclipse.bpel.common.model</b></li>
-	<li><b>org.eclipse.bpel.common.ui</b> - Common UI classes are here.
-	<li><b>org.eclipse.bpel.model</b> -  The BPEL model classes generated from the EMF model, resource sets, etc.
-	<li><b>org.eclipse.bpel.wsil.model</b> - The WSIL model we use in the WSIL browser.
-	<li><b>org.eclipse.bpel.ui</b> - The main editor code.
-	<li><b>org.eclipse.bpel.runtimes</b> - This is what runtimes need to extend in order to plug in.
-	<li><b>org.eclipse.bpel.apache.ode.runtime</b> - A Reference integration with the Apache ODE runtime.
-    <li><b>org.eclipse.bpel.apache.ode.deploy.ui</b> - An Editor to create an Apache ODE deployment descriptor.
-    <li><b>org.eclipse.bpel.apache.ode.deploy.model</b> - The EMF model for the deployment descriptor editor.
-	<li><b>org.eclipse.bpel.validator</b> - A BPEL validator that will check the BPEL source for errors.
-	<li><b>org.eclipse.bpel.examples.extensionPoints</b> - Some examples of extension points provided by other plugins
-	in the BPEL editor.
-</ul>
-
-<p>
-<div class="warning">
-Note that as of M4 and Ganymede release of Eclipse, the EMF models in the BPEL editor are generated against WTP 2.0 EMF models (WSDL, XSD)
-and use Java 5 compliance to generate the code. This means for the most part that generics are used in generated source.
-All the source in the BPEL editor requires at least Java 1.5
-</div>
-
-If you don't know really what the above means, <a href="http://dev.eclipse.org/mhonarc/lists/bpel-dev/msg00319.html">just be thankfull.</a> 
-</p>
-
-<p>
-<span class="section section-counter section-counter-next">.</span> 
-Launch a runtime workbench (a.k.a. Eclipse Application). The new workbench will have the
-just installed plugins with it and it just ought to run them.
-
-<p>
-<span class="section section-counter section-counter-next">.</span> 
-In the running workbench with the BPEL plugins create a new BPEL project and then create a BPEL process
-using the new BPEL file wizard. You should get a skeleton of a BPEL source file to work with.
-<p>
-If you have other BPEL sources you can open them as well, however, they first need to be imported into 
-an eclipse project which by default must live in an eclipse workspace. As long as the BPEL source file 
-has 2.0 code, the editor ought to be able to open it.
-
-<p>
-<span class="section section-counter section-counter-next">.</span> 
-Double-click on the .bpel file to open the BPEL editor.
-
-
-<p>
-<h4>What does it do ? </h4>
-
-<ul class="midlist">
-    <li>Wizard to create new BPEL files</li>
-	<li>Opens, views, edits and saves a .bpel file</li>
-	<li>Create new activities, modify their properties (in the Properties view)</li>
-	<li>Supports all of BPEL 2.0 structures - some UI to modify those is not implemented yet</li>
-	<li>File browsing dialogs, so you can browse for WSDL or XSD files</li>	
-	<li>Has a XPath editor for building expressions and queries</li>
-	<li>Has some extension points you can try implementing</li>
-	<li>Has BPEL validation</li>
-	<li>It can talk to a runtime through an add on run-time plugin</li>
-	<li>It can copy/cut/paste most things pretty well (to and from source as well)</li>	
-	<li>Import WSDL definitions from the WSIL browser</li>	
-	<li>Edit the BPEL "source" (XML editing) in the XML tab</li>
-	<li>Initial support for abstract business processes</li>
-</ul>
-
-More details on that are available on the <a class="www" href="users.php"><i>Users</i> 
- page</a>. Check the Milestones entries (M1, M2, M3, M4).
-
-<h4>What doesn't it do yet</h4>
-<ul class="midlist">		
-	<li>Full BPEL 2.0 UI support</li>
-	<li>Debug</li>
-</ul>
-
-
-<h4>I found a bug </h4>
-<p>
-We now have Bugzilla components (in the Technology Project). Or you can enter a bug directly
-into one of our <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Bpel">components</a>.
-</p>
-
-<p>
-Patches are most welcome.
-</p>
-
-The <a class="www" href="/bpel/team.php">BPEL Team</a>. 
+		The
+		<a class="www" href="/bpel/team.php">BPEL Team</a>
+		.
 
 
 		<hr class="clearer" />
 	</div>
-	<div id="rightcolumn">
-		<div class="sideitem">
-			<h6>Links</h6>
-			<ul>
-			   <li><a href="http://download.eclipse.org/technology/bpel/update-site/" target="download">BPEL Editor Update Site</a>
-			</ul>
-		</div>
+</div>
+<div id="rightcolumn">
+	<div class="sideitem">
+		<h6>Incubation</h6>
+		<p>
+			<div align="center">
+				<a href="/projects/what-is-incubation.php">
+					<img align="center" src="/images/egg-incubation.png" border="0" />
+				</a>
+			</div>
+			<div align="center">
+				This project is in the
+				<a href="/projects/dev_process/validation-phase.php">Incubation Phase</a>
+			</div>
+		</p>
+	</div>
+	<div class="sideitem">
+		<h6>links</h6>
+		<ul>
+			<li>
+				<a href="http://download.eclipse.org/technology/bpel/update-site/"
+					target="download">BPEL Editor Update Site</a>
+			</li>
+		</ul>
 	</div>
 </div>
 
+	
 
-<?php bpel_generate_page() ?>
+EOHTML;
+
+
+# Generate the web page
+$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/install/OrderProcessingSampleProject.zip b/install/OrderProcessingSampleProject.zip
deleted file mode 100644
index fada955..0000000
--- a/install/OrderProcessingSampleProject.zip
+++ /dev/null
Binary files differ
diff --git a/install/SampleProject.zip b/install/SampleProject.zip
deleted file mode 100644
index a7b6450..0000000
--- a/install/SampleProject.zip
+++ /dev/null
Binary files differ
diff --git a/js/js.js b/js/js.js
deleted file mode 100644
index 8bf7444..0000000
--- a/js/js.js
+++ /dev/null
@@ -1,20 +0,0 @@
-function setImage(id,src) {
-    var e = document.getElementById(id)
-    if (e == null || e.tagName != "IMG") return
-    e.src = src
-}
-
-function P(id,op) {
-   var player = window[id] || window.document[id]
-   if (!player) {
-       alert("Player " + id + " not found")
-       return
-   }
-   if (op == "play") {
-       player.Play()
-   } else if (op == "stop") {
-       player.Stop()
-   } else if (op == "rew") {
-       player.Rewind()
-   }
-}
\ No newline at end of file
diff --git a/js/main.php b/js/main.php
deleted file mode 100644
index 5176bde..0000000
--- a/js/main.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php 
-  /** 
-   * Note: Even though this is text/xhtml, so xml, the script tag must have a closing
-     script tag, otherwise, IE will not process it. Not sure where this wierdness comes
-     from
-   */
-?>
-<script type="text/javascript" src="/<?=$projectShortName?>/js/js.js"></script>
diff --git a/people/.cvsignore b/people/.cvsignore
deleted file mode 100644
index 085e8ba..0000000
--- a/people/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/people/bbrodt.jpg b/people/bbrodt.jpg
new file mode 100644
index 0000000..d51e140
--- /dev/null
+++ b/people/bbrodt.jpg
Binary files differ
diff --git a/style/main.php b/style/main.php
deleted file mode 100644
index fc74a9c..0000000
--- a/style/main.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<link rel="stylesheet" type="text/css" href="/<?=$projectShortName?>/style/main.css"/>
-<link rel="stylesheet" type="text/css" href="/<?=$projectShortName?>/style/rules.css"/>
\ No newline at end of file
diff --git a/style/rules.css b/style/rules.css
deleted file mode 100644
index b00364e..0000000
--- a/style/rules.css
+++ /dev/null
@@ -1,87 +0,0 @@
-
-ol.validators {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-ol.validators li {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-ol.validators .missing {
-	color: #900;
-	font-weight: bold;
-	background-color: #ebb;
-	border: 1px solid #f00;
-	padding: 5px;
-}
-
-
-table.av {
-	font-size: 9pt;
-}
-
-table.av td {
-	vertical-align: top;
-	border: 1px solid #888;
-	padding: 2px;
-}
-
-table.av th {
-	font-weight: bold;
-	text-align: right;
-	background-color: #ddd;
-	border: 1px solid #888;
-}
-
-
-table.av2 {
-	width: 100%;
-	padding: 3px;
-	border: 1px dotted black;
-	/* background-color: #9694B9; */
-}
-
-table.av2 td {
-	vertical-align: top;
-	border: 1px solid #888;
-	padding: 2px;
-	background-color: #fff;
-}
-
-table.av2 th {
-	font-weight: bold;
-	text-align: center;
-	background-color: #ddd;
-	border: 1px solid #888;
-}
-
-table.av2 .w1 {
-	width: 10px;
-}
-
-table.av2 .w2 {
-	width: 20px;
-}
-
-table.av2 .w4 {
-	width: 40px;
-}
-
-table.av2 .w10 {
-	width: 200px;
-}
-
-.author {
-	font-size: 8pt;
-	text-style: italics;
-}
-
-.warn {
-	color: #900;
-	font-weight: bold;
-	background-color: #ebb;
-}
-
-
diff --git a/team.php b/team.php
index 6e0b0f1..068e7ae 100644
--- a/team.php
+++ b/team.php
@@ -1,9 +1,21 @@
-<?php
-    require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
-    	
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
+	#*****************************************************************************
+	#
+	# template.php
+	#
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
+	#
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
+	#****************************************************************************
+	
+	#
 	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "BPEL Project Team";
-	$pageKeywords	= "BPEL, process, designer, user";
+	$pageTitle 		= "BPEL Designer Project";
+	$pageKeywords	= "BPEL, process, designer, team";
 	$pageAuthor		= "BPEL Team";
 	
 	# Add page-specific Nav bars here
@@ -11,189 +23,192 @@
 	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
 	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
 	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>
+
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
 
 <div id="maincontent">
 	<div id="midcolumn">
-		<div align="center">		
-		  <h1>BPEL Designer Team</h1>
-		</div>
-				
-		People involved in the BPEL Project, in no particular order ... really.
-		
+		<h1>$pageTitle</h1>
+		<h2>The Team</h2>
+		People involved in the BPEL Project, in no particular order ...
+		really.
+
 		<div class="homeitem3col">
 			<h3>Leads</h3>
-			<ul>
-				<li>
-				  <div style="min-height: 120px;">
-				    <div style="float: left; margin-right: 10px;">
-				       <img alt="Simon" src="people/smoser.jpg" />
-				    </div> 
-				    Simon Moser <br/>
-				    <span class="mail">smoser{at}de.ibm.com</span> <br/>
-				    Location: Somewhere in Boeblingen, Germany
-				    <p>
-				    Blamed for: Blamed for BPEL EMF Model and parts of the BPEL Specification
-				    </p>				    
-				  </div>				 
-				</li>
-				
-				<li>
-				  <div style="min-height: 75px;">
-				    <div style="float: left; margin-right: 10px;">
-				       <img alt="Michal" src="people/michal.png"/> 
-				    </div>				    				        
-				    Michal Chmielewski <br/>
-				    <span class="mail">michal.chmielewski{at}oracle.com</span><br/>
-				    Location: Somewhere in Redwood City, CA<br/>
-				    
-				    <p>				    
-				    Blamed for: Wizards, Partner Links, Type/WSDL Browser, 
-				    XPath Editor, Releases, Screen-Captures, &amp; Spelling
-				    </p>
-				    				    
-				  </div>
-				</li>
-				
-			</ul>
+			<table cellpadding="4px" width="500">
+				<tr>
+					<td>
+						<img height="100px" alt="Bob" src="people/bbrodt.jpg" />
+					</td>
+					<td>
+						<a href="mailto:bbrodt@redhat.com">Bob Brodt</a>
+						<br />
+						Location: Colorado Springs, CO
+						<br/>
+						Blamed for: Whatever breaks from now until the end of time.
+					</td>
+				</tr>
+			</table>
 		</div>
-				
-		
+
+
 		<div class="homeitem3col">
 			<h3>Committers</h3>
-			<ul>
-				<li>
-				  <div style="min-height: 120px;">
-				    <div style="float: left; margin-right: 10px;">
-				      <img alt="Oleg" src="people/olegDanilov.jpg"/>
-				    </div>				    				    
-				    Oleg Danilov <br/>	
-				    <span class="mail">oleg.v.danilov{at}intel.com</span>	<br/>		    				   
-				    Location: Somewhere in St. Petersburg, Russia<br/>
-				    <p>
-				    Blamed for: The XML source tab and other stuff.
-				    </p>
-				  </div>
-				</li>
-				<li>
-				  <div style="min-height: 115px;">
-				    <div style="float: left; margin-right: 10px;">
-				       <img alt="Bruno" src="people/bruno.jpg"/> 
-				    </div>				    								    
-				    Bruno Wasserman <br/>
-				    <span class="mail">B.Wassermann{at}cs.ucl.ac.uk</span><br/>
-				    Location: Somewhere in London, UK<br/>
-				    <a href="http://www.cs.ucl.ac.uk/staff/B.Wassermann/" 
-				       class="www">More ...</a><br/>
-				    <p>
-				    Blamed for: Runtime integration framework
-				    </p>				   
-				  </div>				 
-				</li>			
-			</ul>
+			<table cellpadding="4px" width="500">
+				<tr>
+					<td>
+						<img height="100px" alt="Oleg" src="people/olegDanilov.jpg" />
+					</td>
+					<td>
+						<a href="mailto:oleg.v.danilov@intel.com">Oleg Danilov</a>
+						<br />
+						Location: Somewhere in St. Petersburg, Russia
+						<br />
+						Blamed for: The XML source tab and other stuff.
+					</td>
+				</tr>
+			</table>
 		</div>
-		
+
 		
 		<div class="homeitem3col">
 			<h3>Contributors</h3>
-			<ul>
-				<li>
-				  <div style="min-height: 95px;">
-				    <div style="float: left; margin-right: 10px;">
-				       <img alt="Ed" src="people/unknown.jpg"/>
-				    </div>				  				   
-				  Edward Gee<br/>
-				  <span class="mail">edward.gee{at}oracle.com</span><br/>
-				  Location: Somewhere in Redwood City, CA<br/>
-				  
-				  <p>
-				  Blamed for: XPath Editor
-				  </p>				  
-				   
-				  </div>				 
-				</li>
-				
-				<li>
-				  <div style="min-height: 115px;">
-				    <div style="float: left; margin-right: 10px;">
-				       <img alt="Michael" src="people/milliger.jpg"/>
-				    </div>				  				   
-				  Michael Illiger <br/>
-				  <span class="mail">milliger{at}de.ibm.com</span><br/>
-				  Location: Somewhere in Boeblingen, Germany<br/>
-				  
-				  <p>
-				  Blamed for: Quite a few things in the BPEL Designer
-				  </p>				  
-				   
-				  </div>				 
-				</li>
-
-				<li>
-				  <div style="min-height: 120px;">
-				    <div style="float: left; margin-right: 10px;">
-				       <img alt="Dennis" src="people/dushakov.jpg"/>
-				    </div>				  				   
-				  Dennis Ushakov<br/>
-				  <span class="mail">dennis.ushakov{at}intel.com</span><br/>
-				  Location: Somewhere in St.Petersburg, Russia<br/>
-				  
-				  <p>
-				  Blamed for: The XML source tab
-				  </p>				  
-				   
-				  </div>				 
-				</li>
-					
-				<li>
-				  <div style="min-height: 120px;">
-				    <div style="float: left; margin-right: 10px;">
-				       <img alt="Tammo" src="people/tammo.png"/>
-				    </div>				  				   
-				  Tammo van Lessen<br/>
-				  <span class="mail">tammo.van.lessen{at}iaas.uni-stuttgart.de</span><br/>
-				  Location: Somewhere in Stuttgart, Germany<br/>
-
-				  <p>
-				  Blamed for: Runtime Integration with Apache ODE
-				  </p>				  
-				   
-				  </div>				 
-				</li>
-							
-			</ul>
+			<table cellpadding="4px" width="500">
+				<tr>
+					<td>
+						<img height="100px" alt="Ed" src="people/unknown.jpg" />
+					</td>
+					<td>
+						<a href="mailto:edward.gee@oracle.com">Edward Gee</a>
+						<br/>
+						Location: Somewhere in Redwood City, CA
+						<br/>
+						Blamed for: XPath Editor
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<img height="100px" alt="Michael" src="people/milliger.jpg" />
+					</td>
+					<td>
+						<a href="mailto:milliger@de.ibm.com">Michael Illiger</a>
+						<br/>
+						Location: Somewhere in Boeblingen, Germany
+						<br/>
+						Blamed for: Quite a few things in the BPEL Designer
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<img height="100px" alt="Dennis" src="people/dushakov.jpg" />
+					</td>
+					<td>
+						<a href="mailto:dennis.ushakov@intel.com">Dennis Ushakov</a>
+						<br/>
+						Location: Somewhere in St.Petersburg, Russia
+						<br />
+						Blamed for: The XML source tab
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<img height="100px" alt="Tammo" src="people/tammo.png" />
+					</td>
+					<td>
+						<a href="mailto:tammo.van.lessen@iaas.uni-stuttgart.de">Tammo van Lessen</a>
+						<br/>
+						Location: Somewhere in Stuttgart, Germany
+						<br/>
+						Blamed for: Runtime Integration with Apache ODE
+					</td>
+				</tr>
+			</table>
 		</div>
-		
+
 		<div class="homeitem3col">
-			<h3>Assistants</h3>
-			<ul>
-				<li>
-				  <div style="min-height: 154px;">
-				    <div style="float: left; margin-right: 10px;">
-				      <img alt="Benjamin" src="people/bpelBenny.jpg"/>
-				    </div>				    				    
-				    Benjamin Höhensteiger <br/>	
-				    <span class="mail">hoehenbn{at}studi.informatik.uni-stuttgart.de</span>	<br/>		    				   
-				    Location: Somewhere in Stuttgart, Germany <br/>
-				    <p>
-				    Blamed for: The great extension activity tutorial.
-				    </p>
-				  </div>
-				</li>		
-			</ul>
+			<h3>Former Team Members &amp; Committers</h3>
+			<table cellpadding="4px" width="500">
+				<tr>
+					<td>
+						<img height="100px" alt="Simon" src="people/smoser.jpg" />
+					</td>
+					<td>
+						<a href="mailto:smoser@de.ibm.com">Simon Moser</a>
+						<br />
+						Location: Somewhere in Boeblingen, Germany
+						<br/>
+						Blamed for: Blamed for BPEL EMF Model and parts of the BPEL Specification
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<img height="100px" alt="Bruno" src="people/bruno.jpg" />
+					</td>
+					<td>
+						<a href="mailto:B.Wassermann@cs.ucl.ac.uk">Bruno Wasserman</a>
+						<br />
+						Location: Somewhere in London, UK &nbsp; 
+						<a href="http://www.cs.ucl.ac.uk/staff/B.Wassermann/">(More ...)</a>
+						<br/>
+						Blamed for: Runtime integration framework
+			    	</td>
+			    </tr>
+			    <tr>
+			    	<td>
+						<img height="100px" alt="Michal" src="people/michal.png" />
+					</td>
+					<td>
+						<a href="mailto:michal.chmielewski@oracle.com">Michal Chmielewski</a>
+						<br />
+						Location: Somewhere in Redwood City, CA
+						<br />
+						Blamed for: Wizards, Partner Links, Type/WSDL Browser,
+						XPath Editor, Releases, Screen-Captures &amp; Spelling
+			    	</td>
+			    </tr>
+			    <tr>
+			    	<td>
+						<img height="100px" alt="Benjamin" src="people/bpelBenny.jpg" />
+					</td>
+					<td>
+						<a href="mailto:hoehenbn@studi.informatik.uni-stuttgart.de">Benjamin Hoehensteiger</a>
+						<br />
+						Location: Somewhere in Stuttgart, Germany
+						<br/>
+						Blamed for: The great extension activity tutorial.
+			    	</td>
+			    </tr>
+			</table>
 		</div>
-		
 	</div>
 	
 	
 	<div id="rightcolumn">
 		<div class="sideitem">
-		  <?php include ("items/project_links.html"); ?>
-		</div>
-		<div class="sideitem">
-		  <?php include ("items/external_links.html"); ?>
+			<h6>Incubation</h6>
+			<p>
+				<div align="center">
+					<a href="/projects/what-is-incubation.php">
+						<img align="center" src="/images/egg-incubation.png" border="0" />
+					</a>
+				</div>
+				<div align="center">
+					This project is in the
+					<a href="/projects/dev_process/validation-phase.php">Incubation Phase</a>
+				</div>
+			</p>
 		</div>
 	</div>
 </div>
 
-<?php bpel_generate_page() ?>
+
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/template.php b/template.php
index 8587ed6..43f4e07 100644
--- a/template.php
+++ b/template.php
@@ -1,12 +1,15 @@
-<?php
-    require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
 	#*****************************************************************************
+	#
 	# template.php
 	#
-	# Author: 		Michal Chmielewski
-	# Date:			2006-11-15
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
 	#
-	# Description: This is the basic PHP template.
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
 	#****************************************************************************
 	
 	#
@@ -20,13 +23,18 @@
 	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
 	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
 	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>		
+
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
 
 <div id="maincontent">
 	<div id="midcolumn">
-		<h1><?=$pageTitle?></h1>
+		<h1>$pageTitle</h1>
 		<h2>Section title</h2>
-		<p>Intro text.<br/> <a href="#">more about something &raquo;</a> </p>
+		<p>Intro text.<br /> <a href="#">more about something &raquo;</a> </p>
 		<div class="homeitem">
 			<h3>Narrow column</h3>
 			<ul>
@@ -88,4 +96,10 @@
 	</div>
 </div>
 
-<?php bpel_generate_page() ?>
+
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/test.xml b/test.xml
new file mode 100644
index 0000000..ed37bbc
--- /dev/null
+++ b/test.xml
@@ -0,0 +1,53 @@
+<div id="maincontent">
+	<div id="midcolumn">
+		<h1>$pageTitle</h1>
+		<h2>What's in M1 ?</h2>
+		
+		<p>
+		M1 consists essentially of the code that was initially contributed by IBM 
+		with some minor changes to allow for BPEL source authoring (as opposed to just editing the 
+		provided samples).		
+		</p>
+		It is indended to be marginally useful because most of the key functionality will not be 
+		there yet.
+		
+		<p>
+		<span class="feature"></span>
+		You can create a new BPEL process file in any project by choosing 
+		<tt>New -> Other ... ---> BPEL Process File.</tt>. 
+		</p>
+		
+		<ul style="margin-left: 20px;">
+		  <li> Wizard <a href="javascript:void(setImage('wizard','img/new-wizard-1.gif'))">Step 1</a> - 
+		     Pick the BPEL 2.0 file wizard. 
+		  </li>
+		  <li> Wizard <a href="javascript:void(setImage('wizard','img/new-wizard-2.gif'))">Step 2</a> - 
+		     Specify process name, pick namespace, and template to start with.
+		  </li>
+		  <li> Wizard <a href="javascript:void(setImage('wizard','img/new-wizard-3.gif'))">Step 3</a> - 
+		     The process goes into the currently selected container. This last step allows
+		     you to place it anywhere in your workspace that you want.
+		  </li>
+		</ul>
+		
+		<div class="screenshot">
+		   <img id="wizard" alt="New Wizard" src="img/new-wizard-1.gif" />
+		</div>		
+				
+		<p>
+		<span class="feature"></span>
+		Some BPEL specific activities were added to the palette, such as the 
+		Repeat Until loop.
+		</p>
+		 		
+		<div class="screenshot">
+		   <img alt="Repeat Until" src="img/repeat-until.gif"/>
+		</div>
+
+		<p>
+		<span class="feature"></span>
+		A few bug fixes to stabilize the build.
+		</p>
+       		
+	</div>
+</div>
diff --git a/test/bugs.php b/test/bugs.php
deleted file mode 100644
index 05d1c0b..0000000
--- a/test/bugs.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
-<?php
-   require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
-   
-   _require( "/projects/common/project_bugs.class.php");   
-   $our_bugs = new ProjectBugs("technology.bpel")
-?>
-
-<div id="maincontent">
-	<div id="midcolumn">
-	<h1>Huston... We've got bugs:</a></h1>
-
-			<ul>
-	  		<?php
-	  		//our bugs as a list
-			for($i = 0; $i < $our_bugs->hasbugs(); $i++)			
-			{
-				// Get each bug
-				$a_bug = $our_bugs->getBug($i);
-				?>
-					<li>Votes: <?= $a_bug->getVotes() ?> <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=<?= $a_bug->getBugId() ?>" title="Bug #<?= $a_bug->getBugId()?>"><?= $a_bug->getDescription() ?></a></li>
-				<?
-			}		
-		?>
-		</ul>
-	<p>
-	<br/>
-	<br/>&nbsp;
-	</p>
-	</div>
-	<div id="rightcolumn">
-	<?php
-
-		// pass the title of the sidebar et voila!
-		$our_bugs->getAsSideHTML("Our Top Voted Bugs");
-
-	?>
-	</div>
-</div>
-
-<?php bpel_generate_page() ?>	
diff --git a/test/p.t1.html b/test/p.t1.html
deleted file mode 100644
index 11fb5bf..0000000
--- a/test/p.t1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
-<ul style="border: 1px solid black;">
-<li>  A sample part file (p1.t1.html)
-<li>  Another item 
-</ul>
-
diff --git a/test/p.t2.php b/test/p.t2.php
deleted file mode 100644
index 01d30a9..0000000
--- a/test/p.t2.php
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  <ul>
-    <li>Item 1</li>
-    <li>Item 2</li>
-    
-  </ul>
-  
-  <?php 
-     echo "This is inside the php command tag ...<br><br>";
-  ?>
-  
\ No newline at end of file
diff --git a/test/t.php b/test/t.php
deleted file mode 100644
index 290d584..0000000
--- a/test/t.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php 
-    require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php"); 	
-    	
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "BPEL Project Developer Resources";
-	$pageKeywords	= "BPEL, process, designer, developer";
-	$pageAuthor		= "BPEL Team";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>
-
-<div id="maincontent">
-
-<?php include ("p.t1.html"); ?>
-    <p>
-    This is HTML test after p1.t1.html
-    </p>
-<?php  include("p.t2.php"); ?>
-
- This is the near the end of the div ... <?=$pageTitle?>, which "is really weird".
- 
-</div>
-
-<?php bpel_generate_page() ?>
diff --git a/users.php b/users.php
index a0269ce..68d0956 100644
--- a/users.php
+++ b/users.php
@@ -1,33 +1,53 @@
-<?php
-    require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
-    	
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
+	#*****************************************************************************
+	#
+	# template.php
+	#
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
+	#
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
+	#****************************************************************************
+	
+	#
 	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "BPEL Project User Resources";
-	$pageKeywords	= "BPEL, process, designer, user";
+	$pageTitle 		= "BPEL Designer Project";
+	$pageKeywords	= "BPEL, SOA, WSDL, Eclipse";
 	$pageAuthor		= "BPEL Team";
 	
 	# Add page-specific Nav bars here
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>
+	$Nav->addNavSeparator("Interesting Links", 	"");
+	$Nav->addCustomNav("Scientific Workflows using BPEL", "http://sse.cs.ucl.ac.uk/index.php?id=omii-bpel", "_blank", 1);
+	$Nav->addCustomNav("WS-BPEL 2.0", "http://docs.oasis-open.org/wsbpel/2.0/wsbpel-v2.0.html", "_blank", 1);
+	$Nav->addCustomNav("OASIS TC", "http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsbpel", "_blank", 1);
+	
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
+
 
 <div id="maincontent">
 	<div id="midcolumn">
-		<div align="center"><h1>BPEL Project</h1></div>
+		<h1>$pageTitle</h1>
 		<h2>User Resources</h2>
 		Some useful information as to how to get started with the BPEL designer.
 		
-		<div class="homeitem">
+		<div class="homeitem3col">
 			<h3>What's new</h3>
 			<ul>
-                <li><a href="users/m3.php">M3 Information</a>  <span class="dates">06/29/2007</span></li>			
+                <li><a href="users/m4.php">M4 Information</a>  <span class="dates">09/01/2010</span></li>			
+				<li><a href="users/m3.php">M3 Information</a>  <span class="dates">06/29/2007</span></li>			
 				<li><a href="users/m2.php">M2 Information</a>  <span class="dates">11/28/2006</span></li>
 				<li><a href="users/m1.php">M1 Information</a>  <span class="dates">11/15/2006</span></li>
 			</ul>
 		</div>
-		<div class="homeitem">
+		<div class="homeitem3col">
 			<h3>Guides, HowTos</h3>
 			<ul>
 			
@@ -42,14 +62,25 @@
 		</div>
 		<hr class="clearer" />
 	</div>
+		
 	<div id="rightcolumn">
-		<div class="sideitem">
-		  <?php include ("items/project_links.html"); ?>
-		</div>
-		<div class="sideitem">
-		  <?php include ("items/external_links.html"); ?>
-		</div>
+    	<div class="sideitem">
+       		<h6>Incubation</h6><p>
+       		<div align="center">
+        		<a href="/projects/what-is-incubation.php">
+           		<img align="center" src="/images/egg-incubation.png" border="0"/></a>
+       		</div>
+       		<div align="center">  
+         		This project is in the 
+         		<a href="/projects/dev_process/validation-phase.php">Incubation Phase</a>
+       		</div>
+     	</div>
 	</div>
 </div>
 
-<?php bpel_generate_page() ?>
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/users/howto/extension.php b/users/howto/extension.php
index 2441f99..356310d 100644
--- a/users/howto/extension.php
+++ b/users/howto/extension.php
@@ -1,12 +1,15 @@
-<?php
-    require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
 	#*****************************************************************************
-	# schema.php
 	#
-	# Author: 		Simon Moser
-	# Date:			2008-10-22
+	# template.php
 	#
-	# Description: This is the basic PHP template.
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
+	#
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
 	#****************************************************************************
 	
 	#
@@ -17,14 +20,22 @@
 	
 	# Add page-specific Nav bars here
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>		
+	$Nav->addNavSeparator("Interesting Links", 	"");
+	$Nav->addCustomNav("Scientific Workflows using BPEL", "http://sse.cs.ucl.ac.uk/index.php?id=omii-bpel", "_blank", 1);
+	$Nav->addCustomNav("WS-BPEL 2.0", "http://docs.oasis-open.org/wsbpel/2.0/wsbpel-v2.0.html", "_blank", 1);
+	$Nav->addCustomNav("OASIS TC", "http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsbpel", "_blank", 1);
+	
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
+
 
 <div id="maincontent">
 	<div id="midcolumn">
-		<h1><?=$pageTitle?></h1>
+		<h1>$pageTitle</h1>
+
 		<h2>Tutorial</h2>
 		<p>This tutorial shows you how to 
 		extend the Eclipse BPEL Designer with custom Activities.
@@ -42,4 +53,9 @@
 	</div>
 </div>
 
-<?php bpel_generate_page() ?>
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/users/howto/ode.php b/users/howto/ode.php
index 11c2019..842eff9 100644
--- a/users/howto/ode.php
+++ b/users/howto/ode.php
@@ -1,12 +1,15 @@
-<?php
-    require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
 	#*****************************************************************************
-	# schema.php
 	#
-	# Author: 		Simon Moser
-	# Date:			2008-10-22
+	# template.php
 	#
-	# Description: This is the basic PHP template.
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
+	#
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
 	#****************************************************************************
 	
 	#
@@ -17,14 +20,20 @@
 	
 	# Add page-specific Nav bars here
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>		
+	$Nav->addNavSeparator("Interesting Links", 	"");
+	$Nav->addCustomNav("Scientific Workflows using BPEL", "http://sse.cs.ucl.ac.uk/index.php?id=omii-bpel", "_blank", 1);
+	$Nav->addCustomNav("WS-BPEL 2.0", "http://docs.oasis-open.org/wsbpel/2.0/wsbpel-v2.0.html", "_blank", 1);
+	$Nav->addCustomNav("OASIS TC", "http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsbpel", "_blank", 1);
+	
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
 
 <div id="maincontent">
 	<div id="midcolumn">
-		<h1><?=$pageTitle?></h1>
+		<h1>$pageTitle</h1>
 		<h2>Tutorial</h2>
 		<p>This tutorial shows you how to 
 		develop, deploy and run a Hello World BPEL 
@@ -42,4 +51,9 @@
 	</div>
 </div>
 
-<?php bpel_generate_page() ?>
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/users/img/NamespacesPropertyTab.png b/users/img/NamespacesPropertyTab.png
new file mode 100644
index 0000000..68e3476
--- /dev/null
+++ b/users/img/NamespacesPropertyTab.png
Binary files differ
diff --git a/users/img/NewFileWizard.png b/users/img/NewFileWizard.png
new file mode 100644
index 0000000..f8c364f
--- /dev/null
+++ b/users/img/NewFileWizard.png
Binary files differ
diff --git a/users/m1.php b/users/m1.php
index e73f533..3417a39 100644
--- a/users/m1.php
+++ b/users/m1.php
@@ -1,12 +1,15 @@
-<?php
-    require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
 	#*****************************************************************************
+	#
 	# template.php
 	#
-	# Author: 		Michal Chmielewski
-	# Date:			2006-11-15
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
 	#
-	# Description: This is the basic PHP template.
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
 	#****************************************************************************
 	
 	#
@@ -17,14 +20,21 @@
 	
 	# Add page-specific Nav bars here
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>		
+	$Nav->addNavSeparator("Milestones", 	"");
+	$Nav->addCustomNav("M1", "/$projectShortName/users/m1.php", "_blank", 1);
+	$Nav->addCustomNav("M2", "/$projectShortName/users/m2.php", "_blank", 1);
+	$Nav->addCustomNav("M3", "/$projectShortName/users/m3.php", "_blank", 1);
+	$Nav->addCustomNav("M4", "/$projectShortName/users/m4.php", "_blank", 1);
+		
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
 
 <div id="maincontent">
-	<div id="midcolumn">
-		<h1><?=$pageTitle?></h1>
+	<div id="midcolumn" style="counter-reset: featureId;">
+		<h1>$pageTitle</h1>
 		<h2>What's in M1 ?</h2>
 		
 		<p>
@@ -44,11 +54,14 @@
 		<ul style="margin-left: 20px;">
 		  <li> Wizard <a href="javascript:void(setImage('wizard','img/new-wizard-1.gif'))">Step 1</a> - 
 		     Pick the BPEL 2.0 file wizard. 
+		  </li>
 		  <li> Wizard <a href="javascript:void(setImage('wizard','img/new-wizard-2.gif'))">Step 2</a> - 
 		     Specify process name, pick namespace, and template to start with.
+		  </li>
 		  <li> Wizard <a href="javascript:void(setImage('wizard','img/new-wizard-3.gif'))">Step 3</a> - 
 		     The process goes into the currently selected container. This last step allows
 		     you to place it anywhere in your workspace that you want.
+		  </li>
 		</ul>
 		
 		<div class="screenshot">
@@ -73,4 +86,9 @@
 	</div>
 </div>
 
-<?php bpel_generate_page() ?>
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/users/m2.php b/users/m2.php
index e4347d3..72c77bc 100644
--- a/users/m2.php
+++ b/users/m2.php
@@ -1,30 +1,40 @@
-<?php
-    require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
 	#*****************************************************************************
+	#
 	# template.php
 	#
-	# Author: 		Michal Chmielewski
-	# Date:			2006-11-15
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
 	#
-	# Description: This is the basic PHP template.
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
 	#****************************************************************************
 	
 	#
 	# Begin: page-specific settings.  Change these. 
 	$pageTitle 		= "BPEL M2 information";
-	$pageKeywords	= "M1,BPEL,info";
+	$pageKeywords	= "M2,BPEL,info";
 	$pageAuthor		= "Michal Chmielewski";
 	
 	# Add page-specific Nav bars here
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>		
+	$Nav->addNavSeparator("Milestones", 	"");
+	$Nav->addCustomNav("M1", "/$projectShortName/users/m1.php", "_blank", 1);
+	$Nav->addCustomNav("M2", "/$projectShortName/users/m2.php", "_blank", 1);
+	$Nav->addCustomNav("M3", "/$projectShortName/users/m3.php", "_blank", 1);
+	$Nav->addCustomNav("M4", "/$projectShortName/users/m4.php", "_blank", 1);
+		
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
 
 <div id="maincontent">
 	<div id="midcolumn" style="counter-reset: featureId;">
-		<h1><?=$pageTitle?></h1>
+		<h1>$pageTitle</h1>
 		<h2>What's in M2 ?</h2>
 		
 		<p>
@@ -241,4 +251,9 @@
 	</div>
 </div>
 
-<?php bpel_generate_page() ?>
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/users/m3.php b/users/m3.php
index 38b3660..77906db 100644
--- a/users/m3.php
+++ b/users/m3.php
@@ -1,12 +1,15 @@
-<?php
-    require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
 	#*****************************************************************************
+	#
 	# template.php
 	#
-	# Author: 		Michal Chmielewski
-	# Date:			2006-11-15
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
 	#
-	# Description: This is the basic PHP template.
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
 	#****************************************************************************
 	
 	#
@@ -17,14 +20,21 @@
 	
 	# Add page-specific Nav bars here
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>		
+	$Nav->addNavSeparator("Milestones", 	"");
+	$Nav->addCustomNav("M1", "/$projectShortName/users/m1.php", "_blank", 1);
+	$Nav->addCustomNav("M2", "/$projectShortName/users/m2.php", "_blank", 1);
+	$Nav->addCustomNav("M3", "/$projectShortName/users/m3.php", "_blank", 1);
+	$Nav->addCustomNav("M4", "/$projectShortName/users/m4.php", "_blank", 1);
+		
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
 
 <div id="maincontent">
 	<div id="midcolumn" style="counter-reset: featureId;" >
-		<h1><?=$pageTitle?></h1>
+		<h1>$pageTitle</h1>
 		<h2>What's in M3 ?</h2>
 		
 		<p>
@@ -46,7 +56,6 @@
 		<div class="screenshot">
 		   <img id="wizard" src="img/m3.gif" />
 		</div>
-		</p>
 
         <!-- feature -->
 		<p>
@@ -59,10 +68,10 @@
 		speed has been improved. Some undo /redo problems were fixed too.
 		
 		<ul style="margin-left: 20px;">
-		  <li> Palette <a href="javascript:void(setImage('palette','img/palette-docked.png'))">docked</a> 		      
-		  <li> Palette <a href="javascript:void(setImage('palette','img/palette-hidden.png'))">hidden</a> 		    
-		  <li> Palette <a href="javascript:void(setImage('palette','img/palette-view.png'))">in a view</a> 		     
-		  <li> Duplicate <a href="javascript:void(setImage('palette','img/command-duplicate.png'))">command</a>
+		  <li> Palette <a href="javascript:void(setImage('palette','img/palette-docked.png'))">docked</a> </li>		      
+		  <li> Palette <a href="javascript:void(setImage('palette','img/palette-hidden.png'))">hidden</a> </li> 		    
+		  <li> Palette <a href="javascript:void(setImage('palette','img/palette-view.png'))">in a view</a> </li>     
+		  <li> Duplicate <a href="javascript:void(setImage('palette','img/command-duplicate.png'))">command</a> </li>
 		</ul>
 		
 		<div class="screenshot">
@@ -80,17 +89,15 @@
 		</p>
 		
 		<ul style="margin-left: 20px;">
-		  <li> Validation <a href="javascript:void(setImage('validate','img/validate-view-1.png'))">in the editor</a>  		     
-		  <li> The <a href="javascript:void(setImage('validate','img/validate-problems-view.png'))">problems view</a> 
-		  <li> Validation <a href="javascript:void(setImage('validate','img/validate-settings.png'))">settings</a>
-         <li> Validation in the <a href="javascript:void(setImage('validate','img/validate-menu.png'))"> menu </a>		  
+		  <li> Validation <a href="javascript:void(setImage('validate','img/validate-view-1.png'))">in the editor</a> </li>  		     
+		  <li> The <a href="javascript:void(setImage('validate','img/validate-problems-view.png'))">problems view</a> </li>
+		  <li> Validation <a href="javascript:void(setImage('validate','img/validate-settings.png'))">settings</a> </li>
+         <li> Validation in the <a href="javascript:void(setImage('validate','img/validate-menu.png'))"> menu </a> </li>  
 		</ul>
 		
 		<div class="screenshot">
 		   <img id="validate" src="img/validate-view-1.png" />
 		</div>
-		</p>
-		
 	
 
         <p>
@@ -117,9 +124,9 @@
 		
 		<ul style="margin-left: 20px;">
 		  <li> WSIL <a href="javascript:void(setImage('wsilb','img/wsil-preferences.png'))">preferences</a> in
-		   Eclipse Preferences 		      
+		   Eclipse Preferences </li>
 		  <li> WSIL <a href="javascript:void(setImage('wsilb','img/wsil-browser.png'))">browser</a> in
-		  import dialog. 		    
+		  import dialog. </li>
 		</ul>		
 		<div class="screenshot">
 		   <img id="wsilb" src="img/wsil-preferences.png" />
@@ -206,8 +213,8 @@
 		We have spent some time cleaning out bugs and are hoping to get the count closer to 0
 		in the future. 
 		<ul style="margin-left: 20px;">
-		 <li> Bugs <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=BPEL&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&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=">fixed so far</a>.
-		 <li> Bugs <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=specific&amp;order=relevance+desc&amp;bug_status=__open__&amp;product=BPEL">still needing fixing.</a>
+		 <li> Bugs <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=BPEL&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&samp;tatus_whiteboard=&keywords_type=allwords&keywords=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&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=">fixed so far</a>. </li>
+		 <li> Bugs <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&product=BPEL">still needing fixing.</a> </li>
 		</ul>
 				
 		</p>
@@ -225,4 +232,10 @@
 	</div>
 </div>
 
-<?php bpel_generate_page() ?>
+
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/users/m4.php b/users/m4.php
new file mode 100755
index 0000000..9a4299c
--- /dev/null
+++ b/users/m4.php
@@ -0,0 +1,90 @@
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+
+	#*****************************************************************************
+	#
+	# template.php
+	#
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
+	#
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
+	#****************************************************************************
+	
+	#
+	# Begin: page-specific settings.  Change these. 
+	$pageTitle 		= "BPEL M4 information";
+	$pageKeywords	= "M4,BPEL,info";
+	$pageAuthor		= "Bob Brodt";
+	
+	# Add page-specific Nav bars here
+	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
+	$Nav->addNavSeparator("Milestones", 	"");
+	$Nav->addCustomNav("M1", "/$projectShortName/users/m1.php", "_blank", 1);
+	$Nav->addCustomNav("M2", "/$projectShortName/users/m2.php", "_blank", 1);
+	$Nav->addCustomNav("M3", "/$projectShortName/users/m3.php", "_blank", 1);
+	$Nav->addCustomNav("M4", "/$projectShortName/users/m4.php", "_blank", 1);
+	
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
+
+<div id="maincontent">
+	<div id="midcolumn" style="counter-reset: featureId;" >
+		<h1>$pageTitle</h1>
+		<h2>What's in M4 ?</h2>
+		
+		<p>
+		This is an interim release for a bunch of bug fixes and some new features.
+		It includes most (if not all) of the bug fixes contributed by the
+		<a href="http://community.jboss.org/en/jbosstools">JBoss Riftsaw and BPEL team</a> (thanks guys!) 
+		</p>
+
+	
+		<!-- feature -->
+		<p>
+		<span class="feature"></span>
+		Here is a <a href="https://bugs.eclipse.org/bugs/buglist.cgi?chfieldto=Now;query_format=advanced;chfieldfrom=2010-01-01;resolution=FIXED;product=BPEL;classification=Technology">
+		complete list of bug fixes and features</a> that have been added since M3.					
+		</p>
+		
+        <!-- feature -->
+		<p>
+		<span class="feature"></span>
+		The BPEL "New File" Wizard has been enhanced to
+		allow specification of a SOAP or HTTP service endpoint, which generates the
+		&lt;service&gt; and &lt;binding&gt; elements in the WSDL artifact.
+		<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319216">See here</a> for details.
+		</p>
+		
+		<div class="screenshot">
+			<img src="img/NewFileWizard.png"/>
+		</div>
+
+        <!-- feature -->
+		<p>
+		<span class="feature"></span>
+		A new Property Sheet Tab has been added for the Process and Activities. This tab displays a list of all
+		namespaces and namespace prefixes that are in-scope. Missing namespace prefixes can also be assigned here.
+		<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324162">See here</a> for details.
+				
+		<div class="screenshot">
+		   <img width="800" id="palette" src="img/NamespacesPropertyTab.png" />
+		</div>
+		</p>
+
+
+		
+	</div>
+</div>
+
+
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>