Adjusted to r2062.

git-svn-id: https://svn.libreccm.org/ccm/trunk@2063 8810af33-2d31-482b-a856-94f89814c4df

ccm-bundle/bundles/base/cfg/project.xml

@@ -80,10 +80,12 @@
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
 <!--   Content Assets   -->
+<!--    
         <ccm:application name="ccm-cms-assets-fileattachment"/>
         <ccm:application name="ccm-cms-assets-imagestep"/>
         <ccm:application name="ccm-cms-assets-notes"/>
         <ccm:application name="ccm-cms-assets-relatedlink"/>
+-->
 
 <!--  CMS Content Types  -->
 <!--    
@@ -125,7 +127,9 @@
 -->
 <!--
         <ccm:application name="ccm-portalserver"/>
+-->
         <ccm:application name="ccm-portalworkspace-homepage"/>
+<!--
         <ccm:application name="ccm-weblog"/>
         <ccm:application name="ccm-webpage"/>
 -->

ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp

@@ -4,7 +4,9 @@
   xmlns:show="/WEB-INF/bebop-show.tld"
   version="1.2">
 
-  <!-- JSP template to use a portal page as index page in navigation  -->
+  <!-- JSP template to use a portal page as index page in navigation  
+        Currently the same as gen-portal.jsp, may change in future to
+        support special features of a site's start page (home page)      -->
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
   <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>

ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepageWorkspace.java

@@ -24,12 +24,12 @@ import com.arsdigita.portalworkspace.ui.PersistentPortal;
 import com.arsdigita.portalworkspace.Workspace;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.xml.Element;
-import com.arsdigita.portalworkspace.ui.PortalConstants;
 import com.arsdigita.kernel.permissions.PermissionService;
 import com.arsdigita.kernel.permissions.PermissionDescriptor;
 import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.Party;
+import com.arsdigita.portalworkspace.WorkspacePage;
 
 import org.apache.log4j.Logger;
 
@@ -55,7 +55,7 @@ public class HomepageWorkspace extends SimpleContainer {
     private String m_name;
     
     public HomepageWorkspace() {
-        super("portal:homepageWorkspace", PortalConstants.PORTAL_XML_NS);
+        super("portal:homepageWorkspace", WorkspacePage.PORTAL_XML_NS);
         m_customizable = false;
 
         if (s_log.isDebugEnabled()) {
@@ -93,10 +93,10 @@ public class HomepageWorkspace extends SimpleContainer {
 
         m_browser = new PersistentPortal(m_model,
                                          m_name,
-                                         PortalConstants.MODE_DISPLAY);
+                                         WorkspacePage.MODE_DISPLAY);
         m_editor = new PersistentPortal(m_model,
                                         m_name,
-                                        PortalConstants.MODE_EDITOR);
+                                        WorkspacePage.MODE_EDITOR);
         
         m_edit.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {

ccm-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/custom.jsp

@@ -11,7 +11,8 @@
         DispatcherHelper.cacheDisable(response);
     </jsp:scriptlet>
 
-<define:page name="itemPage" application="portal" title="OpenCCM" cache="true">
+<define:page name="itemPage" application="portal" 
+             title="OpenCCM"        cache="true">
 
   <define:component name="left" 
                classname="com.arsdigita.portalworkspace.ui.homepage.HomepageWorkspace" />