diff --git a/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/README.txt b/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/README.txt
new file mode 100644
index 000000000..8db7e6319
--- /dev/null
+++ b/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/README.txt
@@ -0,0 +1,6 @@
+jsp files replace  files provided by ccm-ldn-portal.
+
+goal: Make the portal homepage read-only and cached for 15min. EXPERIMENTAL
+
+Dynamic no-cache version is available at /ccm/portal/custom.jsp for admins to get the 'customize area' links.
+see r1082
diff --git a/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/custom.jsp b/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/custom.jsp
new file mode 100755
index 000000000..fef11cc49
--- /dev/null
+++ b/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/custom.jsp
@@ -0,0 +1,37 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+	  xmlns:define="/WEB-INF/bebop-define.tld"
+	  xmlns:show="/WEB-INF/bebop-show.tld"
+	  version="1.2">
+
+    <jsp:directive.page
+        import="com.arsdigita.dispatcher.DispatcherHelper,
+		com.arsdigita.aplaws.ui.*"/>
+
+    <jsp:scriptlet>
+        DispatcherHelper.cacheDisable(response);
+    </jsp:scriptlet>
+
+<define:page name="itemPage" application="portal" title="APLAWS" cache="true">
+
+  <define:component name="left" classname="com.arsdigita.aplaws.ui.HomepageWorkspace" />
+  <define:component name="middle" classname="com.arsdigita.aplaws.ui.HomepageWorkspace" />
+  <define:component name="right" classname="com.arsdigita.aplaws.ui.HomepageWorkspace" />
+
+  <jsp:scriptlet>
+HomepageWorkspaceSelectionModel workspace = new HomepageWorkspaceSelectionModel();
+((HomepageWorkspace)left).setModel(new HomepagePortalSelectionModel(workspace, 0));
+((HomepageWorkspace)left).setName("left");
+((HomepageWorkspace)left).addWidgets();
+((HomepageWorkspace)middle).setModel(new HomepagePortalSelectionModel(workspace, 1));
+((HomepageWorkspace)middle).setName("middle");
+((HomepageWorkspace)middle).addWidgets();
+((HomepageWorkspace)right).setModel(new HomepagePortalSelectionModel(workspace, 2));
+((HomepageWorkspace)right).setCustomizable(true);
+((HomepageWorkspace)right).setName("right");
+((HomepageWorkspace)right).addWidgets();
+  </jsp:scriptlet>
+</define:page>
+
+<show:all/>
+
+</jsp:root>
diff --git a/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/index.jsp b/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/index.jsp
new file mode 100755
index 000000000..2000fb99d
--- /dev/null
+++ b/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/index.jsp
@@ -0,0 +1,39 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+	  xmlns:define="/WEB-INF/bebop-define.tld"
+	  xmlns:show="/WEB-INF/bebop-show.tld"
+	  version="1.2">
+
+    <jsp:directive.page
+        import="com.arsdigita.dispatcher.DispatcherHelper,
+		com.arsdigita.aplaws.ui.*"/>
+
+    <jsp:scriptlet>
+        DispatcherHelper.cacheForWorld(response,900);
+    </jsp:scriptlet>
+
+<define:page name="itemPage" application="portal" title="APLAWS" cache="true">
+
+  <define:component name="left" classname="com.arsdigita.aplaws.ui.HomepageWorkspace" />
+  <define:component name="middle" classname="com.arsdigita.aplaws.ui.HomepageWorkspace" />
+  <define:component name="right" classname="com.arsdigita.aplaws.ui.HomepageWorkspace" />
+
+  <jsp:scriptlet>
+HomepageWorkspaceSelectionModel workspace = new HomepageWorkspaceSelectionModel();
+((HomepageWorkspace)left).setModel(new HomepagePortalSelectionModel(workspace, 0));
+((HomepageWorkspace)left).setReadOnly(true);
+((HomepageWorkspace)left).setName("left");
+((HomepageWorkspace)left).addWidgets();
+((HomepageWorkspace)middle).setModel(new HomepagePortalSelectionModel(workspace, 1));
+((HomepageWorkspace)middle).setReadOnly(true);
+((HomepageWorkspace)middle).setName("middle");
+((HomepageWorkspace)middle).addWidgets();
+((HomepageWorkspace)right).setModel(new HomepagePortalSelectionModel(workspace, 2));
+((HomepageWorkspace)right).setReadOnly(true);
+((HomepageWorkspace)right).setName("right");
+((HomepageWorkspace)right).addWidgets();
+  </jsp:scriptlet>
+</define:page>
+
+<show:all/>
+
+</jsp:root>
diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-admin.xsl
similarity index 61%
rename from ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-admin.xsl
index 30d9905c6..17c6d564a 100644
--- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl
+++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-admin.xsl
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-  version="1.0">
+       version="1.0">
 
-  <xsl:import href="../../../../ROOT/__ccm__/apps/workspace/xsl/admin.xsl"/>
+<!--  <xsl:import href="../../../../ROOT/__ccm__/apps/workspace/xsl/admin.xsl"/>  -->
+  <xsl:import href="../../heirloom/apps/portal-workspace/xsl/admin.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix" />
diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-index.xsl
similarity index 68%
rename from ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-index.xsl
index e76ed6279..9f1406b56 100644
--- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl
+++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-index.xsl
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-  xmlns:ui="http://www.arsdigita.com/ui/1.0"
-  xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
-  xmlns:search="http://rhea.redhat.com/search/1.0"
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+              xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+             xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
+                 xmlns:ui="http://www.arsdigita.com/ui/1.0"
+                xmlns:cms="http://www.arsdigita.com/cms/1.0"
+                xmlns:nav="http://ccm.redhat.com/london/navigation"
+             xmlns:search="http://rhea.redhat.com/search/1.0"
+             xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search portal"
-	version="1.0">
+                  version="1.0">
+
+<!--  <xsl:import href="../../../../ROOT/__ccm__/apps/workspace/xsl/index.xsl"/>  -->
+<xsl:import href="../../heirloom/apps/portal-workspace/xsl/index.xsl"/>
 
-<xsl:import href="../../../../ROOT/__ccm__/apps/workspace/xsl/index.xsl"/>
 <xsl:import href="portal/lib.xsl"/>
 <xsl:import href="portal/portlets.xsl"/>
 <xsl:import href="lib/header.xsl"/>
 <xsl:import href="lib/lib.xsl"/>
-<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
+<!-- <xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>  -->
+<xsl:import href="../../heirloom/packages/bebop/xsl/dcp.xsl"/>
 
 <xsl:param name="context-prefix"></xsl:param>
 <xsl:param name="dispatcher-prefix" />
@@ -41,7 +44,9 @@
 	
 	<body>
         <xsl:call-template name="bebop:dcpJavascript"/>
-		<a class="navHide" href="#startcontent" title="Go directly to main content" accesskey="S">Skip over navigation</a>		
+		<a class="navHide" href="#startcontent" 
+                   title="Go directly to main content"
+                   accesskey="S">Skip over navigation</a>
 		<span class="hide">|</span>
 		<xsl:call-template name="header"/>
 		<xsl:call-template name="wsBreadcrumb"/>
@@ -51,7 +56,7 @@
           </xsl:when>
           <xsl:otherwise>
             <xsl:apply-templates select="portal:workspace"/>
-						<xsl:call-template name="footer"/>
+			<xsl:call-template name="footer"/>
           </xsl:otherwise>
        </xsl:choose>
 	</body>
@@ -76,7 +81,8 @@
 
 <xsl:template name="wsBody">
     
-<table id="mainLayout" width="100%" border="0" cellspacing="0" cellpadding="5" summary="This table is used for a three-column page layout">
+<table id="mainLayout" width="100%" border="0" cellspacing="0" cellpadding="5"
+       summary="This table is used for a three-column page layout">
 <tr>
     <td width="20%" align="left" valign="top" >
 <!--VOID LHS Column -->
@@ -166,8 +172,19 @@
 
 
 </xsl:stylesheet>
-<!-- Stylus Studio meta-information - (c)1998-2003. Sonic Software Corporation. All rights reserved.
+<!-- Stylus Studio meta-information - (c)1998-2003. Sonic Software Corporation.
+     All rights reserved.
 <metaInformation>
-<scenarios ><scenario default="yes" name="Scenario2" userelativepaths="yes" externalpreview="no" url="..\XML\newHomepagePortal.xml" htmlbaseurl="http://194.202.210.43:9005/theme/ibm&#x2D;generic/" outputurl="" processortype="internal" profilemode="0" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/></scenarios><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
+<scenarios ><scenario default="yes" name="Scenario2" userelativepaths="yes" 
+             externalpreview="no" url="..\XML\newHomepagePortal.xml"
+             htmlbaseurl="http://194.202.210.43:9005/theme/ibm&#x2D;generic/"
+             outputurl="" processortype="internal" profilemode="0"
+             urlprofilexml="" commandline="" additionalpath=""
+             additionalclasspath="" postprocessortype="none"
+             postprocesscommandline="" postprocessadditionalpath=""
+             postprocessgeneratedext=""/></scenarios><MapperInfo srcSchemaPath=""
+             srcSchemaRoot="" srcSchemaPathIsRelative="yes"
+             srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot=""
+             destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
 </metaInformation>
 -->
diff --git a/environment/project.xml.gen-dev b/environment/project.xml.gen-dev
index c8af982b0..3d0f48779 100644
--- a/environment/project.xml.gen-dev
+++ b/environment/project.xml.gen-dev
@@ -67,7 +67,6 @@
 <!--    <ccm:application name="ccm-formbuilder-pdf"/>                -->
         <ccm:application name="ccm-forum"/>
 <!--    <ccm:application name="ccm-forum-categorised"/>              -->
-<!--    <ccm:application name="ccm-portalserver"/>                   -->
         <ccm:application name="ccm-portalserver"/>                
         <ccm:application name="ccm-portalworkspace"/>               
 <!--    <ccm:application name="ccm-simplesurvey"/>                   -->