*** empty log message ***
diff --git a/testweb/index.php b/testweb/index.php
index 557150d..92cdece 100755
--- a/testweb/index.php
+++ b/testweb/index.php
@@ -9,7 +9,7 @@
 $Nav = null; // delete right side navigation

 

 $App->AddExtraHtmlHeader( '<link rel="stylesheet" type="text/css" href="/rt/rap-big-header.css"/>' );

-$App->AddExtraHtmlHeader( '<link rel="stylesheet" type="text/css" href="/rt/rap-posts.css"/>' );

+// $App->AddExtraHtmlHeader( '<link rel="stylesheet" type="text/css" href="/rt/rap-posts.css"/>' );

 

 require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/rss.php");

 // $rtnews = rss_to_html($_SERVER['DOCUMENT_ROOT'] . "/rt/rt.rss", "/rt/rt.rss", false, "short", "5");

@@ -41,7 +41,7 @@
 	return $result;

 }

 

-$rtProjects = array("rt.ecf", "rt.eclipselink", "rt.equinox", "rt.ercp", "rt.gemini", "rt.rap", "rt.riena", "rt.smila", "rt.virgo");

+$rtProjects = array("rt.ecf", "rt.eclipselink", "rt.equinox", "rt.ercp", "rt.gemini", "rt.jetty", "rt.rap", "rt.riena", "rt.smila", "rt.virgo");

 $projectList = load_project_info($rtProjects);

 

 // $html = file_get_contents( '_index.html' );

diff --git a/testweb/team-leaders.php b/testweb/team-leaders.php
index 0e93d03..087eec9 100755
--- a/testweb/team-leaders.php
+++ b/testweb/team-leaders.php
@@ -1,48 +1,21 @@
-<?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'
+<?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'
 
-	#*****************************************************************************
-	#
-	# team-leaders.php
-	#
-	#****************************************************************************
-	
-	#
 	# Begin: page-specific settings.  Change these. 
 	$pageTitle 		= "RT Project Leadership";
 	$pageKeywords	= "RT PMC project lead";
-	$pageAuthor		= "";
+	$pageAuthor		= "Jeff McAffer";
 	
-	# 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 markers!	
-ob_start();
-?>		
-
+$html = <<<EOHTML
 	<div id="midcolumn">
 		<h1><?= $pageTitle ?></h1>
 		<h2>Who's running this project?</h2>
-      <p>The RT Project is managed by a small group known as the RT
-        Project Management Committee (PMC). 
-        The work of the Project is organized into subprojects. Each subproject 
-        has a leader who has overall responsibility for its success. Large subprojects 
-        are further divided into component teams, each of who has a leader that 
-        is responsible for its overall success. And so on.  Listed here are the PMC and 
-        project leaders here.  You will encounter many dedicated 
-        project committers and developers in the <a href="/newsgroups" target="_top">newsgroup</a> 
-        and <a href="/mail" target="_top">mailing lists</a>.</p>
+      <p>The RT Project is managed by a small group known as the RT  Project Management Committee (PMC). 
+      The PMC is composed of members representing each sub-project. Listed here are the PMC </p>
 
-
-			<p class=bar>Project Management Committee Members</p>
+			<h3>Project Management Committee Members</h3>
 		      <ul>
 		        <li> 
-		          <b><a name="jeff"></a>Jeff McAffer, <a href="http://eclipsesource.com">EclipseSource</a>, RT PMC co-lead</b><br>
+		          <b>Jeff McAffer, <a href="http://eclipsesource.com">EclipseSource</a>, RT PMC co-lead</b><br>
 		          Jeff leads the Eclipse <a href="http://eclipse.org/equinox">Equinox 
 		          OSGi</a>, <a href="http://eclipse.org/rcp">RCP</a> and <a href="http://eclipse.org/orbit">Orbit</a>
 		          teams and is co-founder and CTO of <a href="http://eclipsesource.com">EclipseSource</a>. He is one 
@@ -67,11 +40,32 @@
 		          to enterprise customers, while guiding strategic technical contributions to Eclipse. EclipseSource staff are 
 		          involved in many Eclipse projects such as Equinox, PDE, RAP, ECF, p2, Riena, Eclipse Packaging and g-Eclipse.
 		       </li>
+				<li>
+					<b>Christian Campo, Riena</b>
+				</li>
 		        <li> 
-		          <b><a name="doug"></a>Doug Clarke, Oracle</b><br>
+		          <b>Doug Clarke, EclipseLink</b>
 		       </li>
+				<li>
+					<b>Mike Keith, Gemini</b>
+				</li>
+				<li>
+					<b>Markus Kuppe, ECF</b>
+				</li>
+				<li>
+					<b>Jesse McConnell, Jetty</b>
+				</li>
+				<li>
+					<b>Glyn Norminton, Virgo</b>
+				</li>
+				<li>
+					<b>Mark Rogalski, eRCP</b>
+				</li>
+				<li>
+					<b>Sebastian Voigt, SmiLa</b>
+				</li>
 		        <li> 
-		          <b><a name="tom"></a>Thomas Watson, IBM, <a href="http://eclipse.org/equinox">Equinox co-lead</a></b><br>
+		          <b>Thomas Watson, IBM, <a href="http://eclipse.org/equinox">Equinox co-lead</a></b><br>
 	              Tom is a member of the Eclipse <a href="http://eclipse.org/rt/team-leaders.php">RT PMC</a> and 
 	              co-leads the <a href="http://eclipse.org/equinox">Equinox Project</a> at Eclipse. Tom's focus is on 
 	              modularity and the OSGi Framework design and development. Tom is the lead developer for the Equinox OSGi 
@@ -79,39 +73,12 @@
 	              In particular, Tom participates in the Core Platform Export Group at the OSGi Alliance and is currently 
 	              working on the next OSGi specification.
 		       </li>
-		        <li> 
-		          <b><a name="ricco"></a>Ricco Deutscher, Sopera</b><br>
-		       </li>
-		      </ul>
-
-	<p class=bar>Project Leads</p>
-
-<p>
-			<ul>
-				<li><a href="/ecf" target="_top">ECF</a> -- <a href="">Scott Lewis</a> </li>
-				<li><a href="/eclipselink" target="_top">EclipseLink</a> -- <a href="#doug">Doug Clarke</a> </li>
-				<li><a href="/equinox" target="_top">Equinox</a> -- <a href="#jeff">Jeff McAffer</a> and <a href="#tom">Tom Watson</a></li>
-				<li><a href="/ercp" target="_top">eRCP</a> -- <a href="">Gorkem Ercan</a> </li>
-				<li><a href="/rap" target="_top">RAP</a> -- <a href="">Rüdiger Herrmann</a> </li>
-				<li><a href="/riena" target="_top">Riena</a> -- <a href="">Christian Campo</a> </li>
-				<li><a href="/smila" target="_top">SMILA</a> -- <a href="">August Georg Schmidt and Igor Novakovic</a> </li>
-				<li><a href="/swordfish" target="_top">Swordfish</a> -- <a href="">Oliver Wolf </a> </li>
-      		</ul>
-</p>
+			</ul>
 
 			<p>&nbsp;</p>
 
 	</div>
-<?php
-	include $_SERVER['DOCUMENT_ROOT'] . "/rt/global-links.html";
-	if (file_exists("dir-links.html")) {include "dir-links.html";}
-?>
+EOHTML;
 
-
-<?php
-	$html = ob_get_contents();
-	ob_end_clean();
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+generateRapPage( $App, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html );
 ?>