diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml
index cc08dbba01..bdf3677542 100644
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -67,7 +67,7 @@
          <from-email-address>alfresco@alfresco.org</from-email-address>
          
          <!-- WCM domain and port for virtualisation server -->
-         <wcm-domain>alfresco.dyndns.org</wcm-domain>
+         <wcm-domain>localdomain.lan</wcm-domain>
          <wcm-port>8180</wcm-port>
       </client>
    </config>
diff --git a/project-build.xml b/project-build.xml
index 0ba53e7501..dff09752ca 100644
--- a/project-build.xml
+++ b/project-build.xml
@@ -104,15 +104,29 @@
    </target>
    
    <target name="sample-website" depends="init">
+     <mkdir dir="${dir.build}/sample-website/alfresco"/>
+     <copy todir="${dir.build}/sample-website/alfresco">
+       <fileset dir="source/test-resources/websites/alfresco" excludes="**/.svn"/>
+     </copy>
      <javac srcdir="source/test-resources/websites/alfresco/ROOT/WEB-INF/classes"
+	    destdir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/classes"
+            deprecation="on" debug="on" target="1.5" source="1.5"
 	    classpathref="classpath.compile"/>
-     <mkdir dir="source/test-resources/websites/alfresco/ROOT/WEB-INF/lib"/>
-     <jar basedir="source/test-resources/websites/alfresco/ROOT/WEB-INF/classes"
-	  destfile="source/test-resources/websites/alfresco/ROOT/WEB-INF/lib/alfresco-sample-website.jar"
+     <mkdir dir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/lib"/>
+     <jar basedir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/classes"
+	  destfile="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/lib/alfresco-sample-website.jar"
 	  includes="**/*.class"/>
+     <delete>
+       <fileset dir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/classes" includes="**/*.class"/>
+     </delete>
+     <copy todir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/lib">
+       <fileset dir="${dir.common.lib}">
+	 <include name="standard.jar"/>
+	 <include name="jstl.jar"/>
+       </fileset>
+     </copy>
      <mkdir dir="${dir.dist}"/>
      <zip destfile="${dir.dist}/alfresco-sample-website.zip" 
-	  basedir="source/test-resources/websites/alfresco/" 
-	  excludes="**/.svn"/>
+	  basedir="${dir.build}/sample-website/alfresco"/>
    </target>
 </project>
diff --git a/source/test-resources/websites/alfresco/ROOT/WEB-INF/classes/org/alfresco/web/pr/Util.java b/source/test-resources/websites/alfresco/ROOT/WEB-INF/classes/org/alfresco/web/pr/Util.java
index ec0cdec2da..c61a0bedb1 100644
--- a/source/test-resources/websites/alfresco/ROOT/WEB-INF/classes/org/alfresco/web/pr/Util.java
+++ b/source/test-resources/websites/alfresco/ROOT/WEB-INF/classes/org/alfresco/web/pr/Util.java
@@ -18,6 +18,7 @@ package org.alfresco.web.pr;
 
 import javax.servlet.*;
 import javax.servlet.http.*;
+import javax.servlet.jsp.PageContext;
 import java.io.*;
 import java.util.*;
 import org.alfresco.jndi.*;
@@ -29,12 +30,10 @@ import java.text.*;
 
 public class Util
 {
-    public static List<PressReleaseBean> getPressReleases(final HttpServletRequest request,
-							  final ServletContext servletContext)
+    public static List<PressReleaseBean> getPressReleases(final PageContext pageContext)
 	throws Exception
     {
-	final Map<String, Document> entries = Util.loadXMLDocuments(request,
-								    servletContext,
+	final Map<String, Document> entries = Util.loadXMLDocuments(pageContext,
 								    "/media/releases/content",
 								    "alfresco:press-release");
 	final List<PressReleaseBean> result = new ArrayList<PressReleaseBean>(entries.size());
@@ -56,12 +55,10 @@ public class Util
 	return result;
     }
 
-    public static List<CompanyFooterBean> getCompanyFooters(final HttpServletRequest request,
-							    final ServletContext servletContext)
+    public static List<CompanyFooterBean> getCompanyFooters(final PageContext pageContext)
 	throws Exception
     {
-	final Map<String, Document> entries = Util.loadXMLDocuments(request,
-								    servletContext,
+	final Map<String, Document> entries = Util.loadXMLDocuments(pageContext,
 								    "/media/releases/content/company_footers",
 								    "alfresco:company-footer");
 	final List<CompanyFooterBean> result = new ArrayList<CompanyFooterBean>(entries.size());
@@ -77,8 +74,7 @@ public class Util
 	return result;
     }
 
-    private static Map<String, Document> loadXMLDocuments(final HttpServletRequest request,
-							  final ServletContext servletContext,
+    private static Map<String, Document> loadXMLDocuments(final PageContext pageContext,
 							  final String path,
 							  final String documentElementNodeName)
 	throws Exception
@@ -90,33 +86,31 @@ public class Util
 
 	// The real_path will look somethign like this:
 	//   /alfresco.avm/avm.alfresco.localhost/$-1$alfreco-guest-main:/appBase/avm_webapps/my_webapp
-	//
-	String real_path = servletContext.getRealPath(path);
+	final String realPath = pageContext.getServletContext().getRealPath(path);
 
 	// The avm_path to the root of the context will look something like this:
 	//    alfreco-guest-main:/appBase/avm_webapps/my_webapp
-	//
-	String avm_path = real_path.substring(real_path.indexOf('$', real_path.indexOf('$') + 1)  + 1);
-	avm_path = avm_path.replace('\\','/');
+	String avmPath = realPath.substring(realPath.indexOf('$', realPath.indexOf('$') + 1)  + 1);
+	avmPath = avmPath.replace('\\','/');
 
 	final AVMRemote avm_remote = AVMFileDirContext.getAVMRemote();
-	final Map<String, AVMNodeDescriptor> entries = avm_remote.getDirectoryListing(-1, avm_path);
+	final Map<String, AVMNodeDescriptor> entries = avm_remote.getDirectoryListing(-1, avmPath);
 
 	Map<String, Document> result = new HashMap<String, Document>();
 	for (Map.Entry<String, AVMNodeDescriptor> entry : entries.entrySet() )
 	{
-	    final String entry_name = entry.getKey();
-	    AVMNodeDescriptor entry_node = entry.getValue();
-	    if (entry_node.isFile())
+	    final String entryName = entry.getKey();
+	    AVMNodeDescriptor entryNode = entry.getValue();
+	    if (entryNode.isFile())
 	    {
 		final InputStream istream = 
-		    new AVMRemoteInputStream(avm_remote.getInputHandle(-1, avm_path + '/' + entry_name), 
+		    new AVMRemoteInputStream(avm_remote.getInputHandle(-1, avmPath + '/' + entryName), 
 					     avm_remote );
 		try
 		{
 		    final Document d = db.parse(istream);
 		    if (documentElementNodeName.equals(d.getDocumentElement().getNodeName()))
-			result.put(entry_name, d);
+			result.put(entryName, d);
 		}
 		catch (Throwable t)
 		{
diff --git a/source/test-resources/websites/alfresco/ROOT/WEB-INF/pr.tld b/source/test-resources/websites/alfresco/ROOT/WEB-INF/pr.tld
new file mode 100644
index 0000000000..2b26a7e27e
--- /dev/null
+++ b/source/test-resources/websites/alfresco/ROOT/WEB-INF/pr.tld
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd"
+        version="2.0">
+
+    <tlib-version>1.0</tlib-version>
+    <short-name>pr</short-name>
+    <uri>http://www.alfresco.org/pr</uri>
+    <function>
+      <name>getPressReleases</name>
+      <function-class>org.alfresco.web.pr.Util</function-class>
+      <function-signature>java.util.List getPressReleases(javax.servlet.jsp.PageContext)</function-signature>
+    </function>
+    <function>
+      <name>getCompanyFooters</name>
+      <function-class>org.alfresco.web.pr.Util</function-class>
+      <function-signature>java.util.List getCompanyFooters(javax.servlet.jsp.PageContext)</function-signature>
+    </function>
+</taglib>
diff --git a/source/test-resources/websites/alfresco/ROOT/WEB-INF/web.xml b/source/test-resources/websites/alfresco/ROOT/WEB-INF/web.xml
index 0e866198f8..d5d778a8a9 100644
--- a/source/test-resources/websites/alfresco/ROOT/WEB-INF/web.xml
+++ b/source/test-resources/websites/alfresco/ROOT/WEB-INF/web.xml
@@ -5,13 +5,16 @@
   "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app>
-   <display-name>Alfresco Website</display-name>
-    
-   <description>Alfresco Website</description>
+    <display-name>Alfresco Website</display-name>
+    <description>Alfresco Website</description>
 
    <!-- Faces Servlet -->
+    <taglib>
+        <taglib-uri>http://www.alfresco.org/pr</taglib-uri>
+        <taglib-location>/WEB-INF/pr.tld</taglib-location>
+    </taglib>
 
-   <welcome-file-list>
-      <welcome-file>index.jsp</welcome-file>
-   </welcome-file-list>
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
 </web-app>
diff --git a/source/test-resources/websites/alfresco/ROOT/media/releases/get_company_footer_simple_type.jsp b/source/test-resources/websites/alfresco/ROOT/media/releases/get_company_footer_simple_type.jsp
index 92a82bc45b..a260a9a6d8 100644
--- a/source/test-resources/websites/alfresco/ROOT/media/releases/get_company_footer_simple_type.jsp
+++ b/source/test-resources/websites/alfresco/ROOT/media/releases/get_company_footer_simple_type.jsp
@@ -1,25 +1,24 @@
-<jsp:directive.page language="java" contentType="text/html; charset=UTF-8"/>
-
-<jsp:directive.page import="java.util.*"/>
-<jsp:directive.page import="org.alfresco.web.pr.*"/>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-	   elementFormDefault="qualified">
-  <xs:simpleType name="company-footer">
-    <xs:restriction base="xs:string">
-<%
-List<CompanyFooterBean> companyFooters = Util.getCompanyFooters(request, application);
-for (CompanyFooterBean companyFooter : companyFooters)
-{
-%>
-      <xs:enumeration value="<%= companyFooter.getHref() %>">
-	<xs:annotation>
-	  <xs:documentation><%= companyFooter.getName() %></xs:documentation>
-	</xs:annotation>
-      </xs:enumeration>
-<%
-}
-%>
-    </xs:restriction>
-  </xs:simpleType>
-</xs:schema>
+<jsp:root version="1.2"
+          xmlns:jsp="http://java.sun.com/JSP/Page"
+ 	  xmlns:c="http://java.sun.com/jsp/jstl/core"
+	  xmlns:pr="http://www.alfresco.org/pr">
+  <jsp:directive.page language="java" contentType="text/html; charset=UTF-8"/>
+  <jsp:directive.page isELIgnored="false"/>
+  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+  	   elementFormDefault="qualified">
+    <xs:simpleType name="company-footer">
+      <xs:restriction base="xs:string">
+        <c:forEach items="${pr:getCompanyFooters(pageContext)}" var="companyFooter">
+          <jsp:element name="xs:enumeration">
+	    <jsp:attribute name="value"><c:out value="${companyFooter.href}"/></jsp:attribute>
+            <jsp:body>
+  	      <xs:annotation>
+                <xs:documentation><c:out value="${companyFooter.name}"/></xs:documentation>
+              </xs:annotation>
+            </jsp:body>
+	  </jsp:element>
+        </c:forEach>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:schema>
+</jsp:root>
\ No newline at end of file
diff --git a/source/test-resources/websites/alfresco/ROOT/media/releases/index.jsp b/source/test-resources/websites/alfresco/ROOT/media/releases/index.jsp
index ec4ca0fcbf..1d8adb5895 100644
--- a/source/test-resources/websites/alfresco/ROOT/media/releases/index.jsp
+++ b/source/test-resources/websites/alfresco/ROOT/media/releases/index.jsp
@@ -1,145 +1,153 @@
-<jsp:directive.page language="java" contentType="text/html; charset=UTF-8"/>
-<jsp:directive.page import="java.text.*"/>
-<jsp:directive.page import="java.util.*"/>
-<jsp:directive.page import="org.alfresco.web.pr.*"/>
+<jsp:root version="1.2"
+          xmlns:jsp="http://java.sun.com/JSP/Page"
+ 	  xmlns:c="http://java.sun.com/jsp/jstl/core"
+	  xmlns:pr="http://www.alfresco.org/pr"
+          xmlns:fmt="http://java.sun.com/jsp/jstl/fmt">
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>Alfresco Press Releases - Open Source Content Management</title>
-<meta name="description" lang="en" content="News and press releases about Alfresco's enterprise content management system and document management software." />
-<meta name="keywords" lang="en" content="open source ecms, enterprise content management system, cms, document management system, dms, documentum" />
-<link href="/assets/css/screen.css" rel="stylesheet" type="text/css" media="screen" />
-<link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.nooked.com/news/feed/alfresco" />
-<style type="text/css">
-#main_content .headline {
-	font-size: 1.2em;
-	border-bottom: none;
-	margin-bottom: 0.25em;
-}
-#main_content .date {
-	color: #666666;
-	font-size: 0.9em;
-	margin-top: 0;
-	margin-bottom: 0.25em;
-}
-#main_content .abstract {
-	margin-top: 0;
-}
-</style>
-</head>
-<body>
-<script language="JavaScript" type="text/javascript" src="/assets/js/controls.js"></script>
-<script language="JavaScript" type="text/javascript" src="/assets/js/search.js" ></script>
-<div id="container">
-<div id="masthead">
-<!-- Search -->
-<div id="top_links">
-<ul>
-<li><a href="/accessibility/index.html">Accessibility</a> |</li>
-<li><a href="/sitemap/index.html">Site Map</a> |</li>
-<li><a href="/about/contact/index.html">Contact Us</a> |</li>
-<li><a href="/store/index.html">Store</a> |</li>
-<li><a href="/rss/?feed=all">RSS</a> <img src="/assets/images/icons/feedicon10.gif" alt="RSS" title="RSS" width="10" height="10" /></li>
-</ul>
-<form action="http://www.google.com/search" method="get"><br />
-<input type="hidden" name="sitesearch" value="www.alfresco.com" />
-<input type="hidden" name="ie" value="UTF-8" />
-<input type="hidden" name="oe" value="UTF-8" />
-<input class="searchbox" type="text" size="20" value="Search..." name="query" onfocus="if (this.value == 'Search...') this.value = ''; " onblur="if (this.value == '') this.value = 'Search...';" />
-<input class="searchbutton" type="submit" name="" value="Go" />
-</form>
-</div>
-<!-- End Search -->
-</div>
-<div id="topnav">
-  <ul id="nav">
-    <li id="home"><a href="/index.html" accesskey="h"  ><span>Home</span></a></li>
-    <li id="products"><a href="/products/index.html" accesskey="p"  ><span>Products</span></a></li>
-    <li id="services"><a href="/services/support/index.html" accesskey="s"  ><span>Services</span></a></li>
-    <li id="customers"><a href="/customers/index.html" accesskey="c"  ><span>Customers</span></a></li>
- 	<li id="partners"><a href="/partners/index.html" accesskey="r"  ><span>Partners</span></a></li>
-    <li id="about"><a href="/about/index.html" accesskey="a"  class="selected" ><span>About us</span></a></li>
-	<li id="developers"><a href="http://dev.alfresco.com/" accesskey="v"  ><span>Developers</span></a></li>
-	<li id="blogs"><a href="http://blogs.alfresco.com/" accesskey="b"  ><span>Blogs</span></a></li>
-	<li id="end"></li>
+ <jsp:output doctype-root-element="html"
+    doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+    doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+
+  <jsp:directive.page language="java" contentType="text/html; charset=UTF-8"/>
+    <jsp:directive.page isELIgnored="false"/>
+  
+  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+  <title>Alfresco Press Releases - Open Source Content Management</title>
+  <meta name="description" lang="en" content="News and press releases about Alfresco's enterprise content management system and document management software." />
+  <meta name="keywords" lang="en" content="open source ecms, enterprise content management system, cms, document management system, dms, documentum" />
+  <link href="/assets/css/screen.css" rel="stylesheet" type="text/css" media="screen" />
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.nooked.com/news/feed/alfresco" />
+  <style type="text/css">
+  #main_content .headline {
+  	font-size: 1.2em;
+  	border-bottom: none;
+  	margin-bottom: 0.25em;
+  }
+  #main_content .date {
+  	color: #666666;
+  	font-size: 0.9em;
+  	margin-top: 0;
+  	margin-bottom: 0.25em;
+  }
+  #main_content .abstract {
+  	margin-top: 0;
+  }
+  </style>
+  </head>
+  <body>
+  <script language="JavaScript" type="text/javascript" src="/assets/js/controls.js"></script>
+  <script language="JavaScript" type="text/javascript" src="/assets/js/search.js" ></script>
+  <div id="container">
+  <div id="masthead">
+  <!-- Search -->
+  <div id="top_links">
+  <ul>
+  <li><a href="/accessibility/index.html">Accessibility</a> |</li>
+  <li><a href="/sitemap/index.html">Site Map</a> |</li>
+  <li><a href="/about/contact/index.html">Contact Us</a> |</li>
+  <li><a href="/store/index.html">Store</a> |</li>
+  <li><a href="/rss/?feed=all">RSS</a> <img src="/assets/images/icons/feedicon10.gif" alt="RSS" title="RSS" width="10" height="10" /></li>
   </ul>
-</div>
-<div id="outer">
-  <div id="inner">
-<div id="sabout">
-<p><a href="/about/index.html">Company</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="/about/contact/index.html">Contact</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="/media/releases/index.jsp">News</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="/about/events/index.html">Events</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="/about/people/index.html">People</a></p>
-</div>
-</div>
-</div>
-<div id="content"></div>
-<!-- Main Content -->
-<div id="main_content">
-
-<!-- BEGIN MAIN CONTENT -->
-
-<h1>Alfresco Press Releases</h1>
-
-<%
-List<PressReleaseBean> pressReleases = Util.getPressReleases(request, application);
-for (PressReleaseBean pr : pressReleases)
-{
-%>
-<h2 class="headline"><a href="<%= pr.getHref() %>"><%= pr.getTitle() %></a></h2>
-<p class="date"><%= DateFormat.getDateInstance(DateFormat.LONG).format(pr.getLaunchDate()) %></p><p class="abstract"><%= pr.getAbstract() %></p>
-<%
-}
-%>
-
-<!-- END MAIN CONTENT -->
-
-</div>
-<!-- Feature Content -->
-<div id="right_content">
-<div class="box_blue">
-<h2>Press Release Archive</h2>
-<ul>
-<li><a href="/media/releases/archives/index.html">View Archived Releases</a></li>
-</ul>
-</div>
-</div>
-<div id="clear"></div>
-</div>
-<!--All Three End -->
-<!-- Footer -->
-<div id="footer">
-  <div id="site">
-    <div id="footer-logos">
-    <a href="http://www.mysql.com/"><img src="/assets/images/footer/mysql.gif" alt="MySQL" title="MySQL" border="0" /></a>
-    <a href="http://www.jboss.org"><img src="/assets/images/footer/jboss.gif" alt="JBoss Certified Partner" title="JBoss Certified Partner" border="0" width="74" height="34" /></a>
-    <a href="http://www.springframework.org/"><img src="/assets/images/footer/spring.gif" alt="Spring Framework" title="Spring Framework" border="0" width="67" height="34" /></a>
-    <a href="http://www.hibernate.org/"><img src="/assets/images/footer/hibernate.gif" alt="Hibernate" title="Hibernate" border="0" width="111" height="34" /></a>
-    <a href="http://tomcat.apache.org"><img src="/assets/images/footer/tomcat.gif" alt="Tomcat" title="Tomcat" border="0" width="44" height="34" /></a>
-    <a href="http://lucene.apache.org/"><img src="/assets/images/footer/lucene.gif" alt="Lucene" title="Lucene" border="0" width="143" height="34" /></a>
-    <a href="http://myfaces.apache.org/"><img src="/assets/images/footer/myfaces.gif" alt="My Faces" title="My Faces" border="0" width="37" height="34" /></a></div>
-    <div id="footer-links">
-    <p>
-    <a href="/index.html">Home</a> | 
-    <a href="/legal/index.html">Legal</a> | 
-    <a href="/privacy/index.html">Privacy</a> | 
-	<a href="/accessibility/index.html">Accessibility</a> | 
-	<a href="/sitemap/index.html">Site Map</a> | 
-	<a href="/rss/?feed=all/">RSS</a>
-	<img src="/assets/images/icons/feedicon12.gif" alt="RSS" title="RSS" width="12" height="12" />
-	</p>
-    <p>
-    <a href="/about/index.html">Open Source ECMS</a> | 
-    <a href="/products/index.html">CMS Products</a> | 
-    <a href="/services/support/index.html">Management Services</a> | 
-    <a href="/resources/index.html">EMS Resources</a>
-    </p>
-	<p>&copy; 2005-2006 Alfresco Software, Inc., All Rights Reserved</p>
-	<p><img src="/assets/images/icons/powered_by_alfresco.gif" alt="Powered by Alfresco" width="88" height="32" /></p>
-	</div>
+  <form action="http://www.google.com/search" method="get"><br />
+  <input type="hidden" name="sitesearch" value="www.alfresco.com" />
+  <input type="hidden" name="ie" value="UTF-8" />
+  <input type="hidden" name="oe" value="UTF-8" />
+  <input class="searchbox" type="text" size="20" value="Search..." name="query" onfocus="if (this.value == 'Search...') this.value = ''; " onblur="if (this.value == '') this.value = 'Search...';" />
+  <input class="searchbutton" type="submit" name="" value="Go" />
+  </form>
   </div>
-  <div style="clear:both; padding-bottom: 10px;"></div>
-</div>
-<div style="clear:both; padding-bottom: 20px;"></div>
-<!-- End Footer -->
-</body>
-</html>
+  <!-- End Search -->
+  </div>
+  <div id="topnav">
+    <ul id="nav">
+      <li id="home"><a href="/index.html" accesskey="h"  ><span>Home</span></a></li>
+      <li id="products"><a href="/products/index.html" accesskey="p"  ><span>Products</span></a></li>
+      <li id="services"><a href="/services/support/index.html" accesskey="s"  ><span>Services</span></a></li>
+      <li id="customers"><a href="/customers/index.html" accesskey="c"  ><span>Customers</span></a></li>
+   	<li id="partners"><a href="/partners/index.html" accesskey="r"  ><span>Partners</span></a></li>
+      <li id="about"><a href="/about/index.html" accesskey="a"  class="selected" ><span>About us</span></a></li>
+  	<li id="developers"><a href="http://dev.alfresco.com/" accesskey="v"  ><span>Developers</span></a></li>
+  	<li id="blogs"><a href="http://blogs.alfresco.com/" accesskey="b"  ><span>Blogs</span></a></li>
+  	<li id="end"></li>
+    </ul>
+  </div>
+  <div id="outer">
+    <div id="inner">
+  <div id="sabout">
+  <p><a href="/about/index.html">Company</a>&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;<a href="/about/contact/index.html">Contact</a>&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;<a href="/media/releases/index.jsp">News</a>&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;<a href="/about/events/index.html">Events</a>&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;<a href="/about/people/index.html">People</a></p>
+  </div>
+  </div>
+  </div>
+  <div id="content"></div>
+  <!-- Main Content -->
+  <div id="main_content">
+  
+  <!-- BEGIN MAIN CONTENT -->
+  
+  <h1>Alfresco Press Releases</h1>
+  
+  <c:forEach items="${pr:getPressReleases(pageContext)}" var="pressRelease">
+    <h2 class="headline">
+      <jsp:element name="a">
+        <jsp:attribute name="href"><c:out value="${pressRelease.href}"/></jsp:attribute>
+	<jsp:body><c:out value="${pressRelease.title}"/></jsp:body>
+      </jsp:element>
+    </h2>
+    <p class="date"><fmt:formatDate value="${pressRelease.launchDate}" dateStyle="long"/></p>
+    <p class="abstract"><c:out value="${pressRelease.abstract}"/></p>
+  </c:forEach>
+
+  <!-- END MAIN CONTENT -->
+  
+  </div>
+  <!-- Feature Content -->
+  <div id="right_content">
+  <div class="box_blue">
+  <h2>Press Release Archive</h2>
+  <ul>
+  <li><a href="/media/releases/archives/index.html">View Archived Releases</a></li>
+  </ul>
+  </div>
+  </div>
+  <div id="clear">&#160;</div>
+  </div>
+  <!--All Three End -->
+  <!-- Footer -->
+  <div id="footer">
+    <div id="site">
+      <div id="footer-logos">
+      <a href="http://www.mysql.com/"><img src="/assets/images/footer/mysql.gif" alt="MySQL" title="MySQL" border="0" /></a>
+      <a href="http://www.jboss.org"><img src="/assets/images/footer/jboss.gif" alt="JBoss Certified Partner" title="JBoss Certified Partner" border="0" width="74" height="34" /></a>
+      <a href="http://www.springframework.org/"><img src="/assets/images/footer/spring.gif" alt="Spring Framework" title="Spring Framework" border="0" width="67" height="34" /></a>
+      <a href="http://www.hibernate.org/"><img src="/assets/images/footer/hibernate.gif" alt="Hibernate" title="Hibernate" border="0" width="111" height="34" /></a>
+      <a href="http://tomcat.apache.org"><img src="/assets/images/footer/tomcat.gif" alt="Tomcat" title="Tomcat" border="0" width="44" height="34" /></a>
+      <a href="http://lucene.apache.org/"><img src="/assets/images/footer/lucene.gif" alt="Lucene" title="Lucene" border="0" width="143" height="34" /></a>
+      <a href="http://myfaces.apache.org/"><img src="/assets/images/footer/myfaces.gif" alt="My Faces" title="My Faces" border="0" width="37" height="34" /></a></div>
+      <div id="footer-links">
+      <p>
+      <a href="/index.html">Home</a> | 
+      <a href="/legal/index.html">Legal</a> | 
+      <a href="/privacy/index.html">Privacy</a> | 
+  	<a href="/accessibility/index.html">Accessibility</a> | 
+  	<a href="/sitemap/index.html">Site Map</a> | 
+  	<a href="/rss/?feed=all/">RSS</a>
+  	<img src="/assets/images/icons/feedicon12.gif" alt="RSS" title="RSS" width="12" height="12" />
+  	</p>
+      <p>
+      <a href="/about/index.html">Open Source ECMS</a> | 
+      <a href="/products/index.html">CMS Products</a> | 
+      <a href="/services/support/index.html">Management Services</a> | 
+      <a href="/resources/index.html">EMS Resources</a>
+      </p>
+  	<p>&amp;copy; 2005-2006 Alfresco Software, Inc., All Rights Reserved</p>
+  	<p><img src="/assets/images/icons/powered_by_alfresco.gif" alt="Powered by Alfresco" width="88" height="32" /></p>
+  	</div>
+    </div>
+    <div style="clear:both; padding-bottom: 10px;">&#160;</div>
+  </div>
+  <div style="clear:both; padding-bottom: 20px;">&#160;</div>
+  <!-- End Footer -->
+  </body>
+  </html>
+</jsp:root>
diff --git a/source/test-resources/xforms/demos/press-release/press-release.xsd b/source/test-resources/xforms/demos/press-release/press-release.xsd
index c106cb9080..5552a37180 100644
--- a/source/test-resources/xforms/demos/press-release/press-release.xsd
+++ b/source/test-resources/xforms/demos/press-release/press-release.xsd
@@ -20,7 +20,7 @@
         <xs:element name="abstract" type="xs:string"/>
         <xs:element name="location" type="xs:string"/>
         <xs:element name="body" type="xs:anyType" minOccurs="1" maxOccurs="unbounded"/>
-	<xs:element name="include_company_footer" type="alfresco:company-footer" minOccurs="1" maxOccurs="unbounded" default="Alfresco"/>
+	<xs:element name="include_company_footer" type="alfresco:company-footer" minOccurs="1" maxOccurs="unbounded"/>
 	<xs:element name="include_media_contacts" type="xs:boolean" default="true"/>
 	<xs:element name="keywords" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
 	<xs:element name="category" type="alfresco:category" default="Company"/>