Nachführen der Änderungen in ccm-ldn-aplaws.

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

ccm-gen-aplaws/CHANGE_LOG

@@ -4,7 +4,8 @@ themes) and new names of modules ccm-ldn-portal and ccm-ldn-themes.
 
 2007-08-06:
 ./ccm-shp-aplaws/src/WEB-INF/content-types/c...types/aplaws-mparticle-item.jsp
-<define:page name="itemPage" application="content  changed to
+   <define:page name="itemPage" application="content"
-<define:page name="itemPage" application="content-section"
+changed to
+   <define:page name="itemPage" application="content-section"
 as is all other contenttyp jsp pages. Requires corresponding modification
 in the theme! 

ccm-gen-aplaws/bundles/devel/cfg/applications.cfg

@@ -47,6 +47,7 @@ ccm-sci-types-organization
 
 # Applications
 # ------------
+# ccm-auth-http
 ccm-bookmarks
 ccm-formbuilder-pdf
 ccm-forum

ccm-gen-aplaws/bundles/devel/cfg/integration.properties

@@ -125,12 +125,10 @@ com.arsdigita.london.navigation.default_cat_root_path=/navigation/
 com.arsdigita.london.navigation.default_template=/packages/navigation/templates/gen-default.jsp
 
 
-
 # ccm-ldn-search application
 com.arsdigita.london.search.show_sponsored_links=true
 
 
-
 # ccm-ldn-subsite application
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
@@ -140,8 +138,8 @@ themedirector.default_theme_path=themes/static/aplaws-generic
 
 # com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
-# =============================================================================================
+; =============================================================================================
-# runtime specific configurations
+; runtime specific configurations
 
 waf.admin.email=webmaster@openccm.org
 waf.admin.name.given=aplaws 
@@ -160,4 +158,3 @@ waf.web.server=localhost\:8080
 # devel specific configurations
 waf.debug=true
 waf.bebop.fancy_xsl_errors=true
-

ccm-gen-aplaws/bundles/devel/cfg/web.xml

@@ -52,6 +52,7 @@
   </filter-mapping>
 -->
 
+
   <filter-mapping>
     <filter-name>subsite</filter-name>
     <url-pattern>/*</url-pattern>
@@ -501,6 +502,7 @@
      <url-pattern>/print/*</url-pattern>
  </servlet-mapping>
 
+
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      ERROR PAGES
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

ccm-gen-aplaws/bundles/develpb/cfg/applications.cfg

@@ -12,6 +12,8 @@ ccm-cms-assets-relatedlink
 # is ccm-ldn-dublin really an asset?
 ## -- ccm-ldn-dublin
 
+ccm-cms-publicpersonalprofile
+
 # Content types
 # ccm-cms-types-address
 # ccm-cms-types-agenda
@@ -34,7 +36,7 @@ ccm-cms-types-member
 ccm-cms-types-mparticle
 ccm-cms-types-newsitem
 # ccm-cms-types-organization
-# ccm-cms-types-person
+ccm-cms-types-person
 # ccm-cms-types-pressrelease
 # ccm-cms-types-service
 # ## Fuer OpenCCM aktivieren:
@@ -47,7 +49,7 @@ ccm-cms-types-newsitem
 # ccm-auth-http
 # ccm-bookmarks
 ccm-docmgr
-# ccm-docrepo
+ccm-docrepo
 ccm-faq
 # ccm-formbuilder-pdf
 ccm-forum

ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java

@@ -31,7 +31,7 @@ import org.apache.log4j.Logger;
 /**
  * The APLAWS initializer.
  *
- * @version $Id: Initializer.java 1232 2006-06-22 12:01:30Z sskracic $
+ * @version $Id: Initializer.java 2070 2010-01-28 08:47:41Z pboy $
  */
 public class Initializer extends CompoundInitializer {
 

ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java

@@ -43,8 +43,6 @@ import com.arsdigita.util.parameter.StringParameter;
 // import com.arsdigita.util.parameter.URLParameter;
 import com.arsdigita.web.Application;
 
-import org.apache.log4j.Logger;
-
 // import java.net.URL;
 // import java.net.MalformedURLException;
 // import java.util.Date;
@@ -52,6 +50,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.log4j.Logger;
+
 /**
  * Loader.
  *

ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java

@@ -28,9 +28,10 @@ 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.kernel.Kernel;import org.apache.log4j.Logger;
+import org.apache.log4j.Logger;
 
 
 /** 
@@ -139,6 +140,7 @@ public class HomepageWorkspace extends SimpleContainer {
         m_editor.setVisible(state, !browse);
     }
 
+    @Override
     public void register(Page page) {
         super.register(page);
         
@@ -149,6 +151,7 @@ public class HomepageWorkspace extends SimpleContainer {
         page.setVisibleDefault(m_editor, false);
     }
 
+    @Override
     public void generateXML(PageState state,
                             Element parent) {
         Party party = Kernel.getContext().getParty();

ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java

@@ -41,6 +41,10 @@ import com.arsdigita.domain.DataObjectNotFoundException;
 import org.apache.log4j.Logger;
 
 
+/** 
+ * 
+ * 
+ */
 public class HomepageWorkspaceSelectionModel {
     private RequestLocal m_loaded = new RequestLocal();
     private RequestLocal m_global = new RequestLocal();

ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java.nolongerInUse

@@ -61,6 +61,8 @@ import com.arsdigita.xml.XML;
  * nb - widget applies to allocation of categories to any ACSObject hence
  * xml prefix should be more generic eg bebop rather than cms. cms retained
  * for compatibility with existing stylesheets
+ *
+ * @deprecated  Use c.ad.london.terms.ui.TermWidget  instead!
  */
 public class TermWidget extends Widget {
     private StringParameter m_mode;

ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/README.txt

@@ -2,5 +2,17 @@ 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.
+Dynamic no-cache version is available at /ccm/portal/custom.jsp for admins
+to get the 'customize area' links.
 see r1082
+
+Actually:
+In the default configuration BaseDispatcher searches in the following order:
+1. /templates/ccm-ldn-portal/portal/index.jsp
+2. /templates/ccm-ldn-portal/portal/index.html
+3. /templates/ccm-ldn-portal/index.jsp
+4. /templates/ccm-ldn-portal/index.html  (probably, not tested)
+
+So, currently the first try is successfull and
+aplaws/ui/HomepageWorkspaceSelectionModel is always used via index.jsp
+

ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/index.jsp

@@ -5,35 +5,36 @@
 
   <jsp:directive.page
         import="com.arsdigita.dispatcher.DispatcherHelper,
-		com.arsdigita.aplaws.ui.*"/>
+		        com.arsdigita.aplaws.ui.*" />
 
   <jsp:scriptlet>
         DispatcherHelper.cacheForWorld(response,900);
   </jsp:scriptlet>
 
-<define:page name="itemPage" application="portal" title="APLAWS" cache="true">
+  <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();
+      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/>
+      ((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>

ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
 				xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
 				xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
@@ -30,11 +31,13 @@
   -->
     <xsl:import href="../../../packages/bebop/xsl/dcp.xsl"/>
 
+
 	<xsl:param name="theme-prefix" />
 	<xsl:param name="context-prefix" />
 	<xsl:param name="dispatcher-prefix" />
 
-	<xsl:output method="html" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" doctype-system="http://www.w3.org/TR/html4/loose.dtd" indent="yes" />
+	<xsl:output method="html" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" 
+		        doctype-system="http://www.w3.org/TR/html4/loose.dtd" indent="yes" />
 
 <!-- ********************* MAIN PAGE LAYOUT TEMPLATES ********************* -->
 

ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.xsl

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
 				xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
 				xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
@@ -22,6 +23,7 @@
 	<xsl:import href="lib/header.xsl" />
 	<xsl:import href="lib/lib.xsl" />
 	<xsl:import href="lib/leftNav.xsl" />
+
   <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
 	<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
   -->
@@ -30,8 +32,6 @@
     <xsl:import href="../../../packages/bebop/xsl/dcp.xsl"/>
 
 
-
-
 	<xsl:param name="theme-prefix" />
 	<xsl:param name="context-prefix" />
 	<xsl:param name="dispatcher-prefix" />

ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.xsl

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
 				xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
 				xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
@@ -1303,5 +1304,3 @@
    	</xsl:choose>
 </xsl:template>
 </xsl:stylesheet>
-
-

ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl

@@ -5,7 +5,6 @@
                    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"
- 
     exclude-result-prefixes="xsl bebop aplaws ui cms nav"
                     version="1.0">
 

ccm-ldn-aplaws/CHANGE_LOG

@@ -0,0 +1,11 @@
+2011-05-12
+Adaptation in web to the relocation of default theme files (from __ccm__ to
+themes) and new names of modules ccm-ldn-portal and ccm-ldn-themes.
+
+2007-08-06:
+./ccm-ldn-aplaws/src/WEB-INF/content-types/c...types/aplaws-mparticle-item.jsp
+   <define:page name="itemPage" application="content"
+changed to
+   <define:page name="itemPage" application="content-section"
+as is all other contenttyp jsp pages. Requires corresponding modification
+in the theme! 

ccm-ldn-aplaws/application.xml

@@ -9,18 +9,39 @@
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-subsite" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-ldn-portal" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-portalworkspace" version="6.6.1" relation="ge"/>
     <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
+    <!--  not required anymore (2007-06-09)
     <ccm:requires name="ccm-ldn-dublin" version="6.6.0" relation="ge"/>
+    -->
     <ccm:requires name="ccm-ldn-navigation" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-search" version="6.6.0" relation="ge"/>
   </ccm:dependencies>
+
+  <ccm:directories>
+    <ccm:directory name="pdl"/>
+    <ccm:directory name="src"/>
+  </ccm:directories>
+
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
+
   <ccm:description>
-    The Red Hat Web Application Framework is a platform for writing
+    Service module which tailors the aplaws software to a specific purpose
+    and/or a specific site.
+    - setting up a categorization / terms system (cf. load.java)
+    - integrate custom spezific jsp's
+    - setting up custom specific configuration parameters (cf. the bundles)
+    - overwrite default classes by custom specific ones (cf. src/.../aplaws)
+    - provide a default theme, which meets accessibility requirements and
+      overwrites the default, table based design (cf. web/.../themes)
+    
+    This modules tailors APLAWS to Local Authorities purpose.
+    
+    APLAWS is a collaboration and content management system which is based upon
+    the Red Hat Web Application Framework, which is a platform for writing
     database-backed web applications in Java. 
   </ccm:description>
 </ccm:application>

ccm-ldn-aplaws/bundles/complete/bundle.in

@@ -1,4 +1,4 @@
 BUNDLE_NAME=aplaws-plus-complete
 BUNDLE_PRETTY_NAME="APLAWS+ Complete Bundle"
-VERSION=1.0.5devel
+VERSION=1.1.3devel
 RELEASE=1

ccm-ldn-aplaws/bundles/complete/cfg/applications.cfg

@@ -1,3 +1,5 @@
+# Complete bundle application.cfg
+
 # Main apps
 ccm-core
 ccm-cms
@@ -5,10 +7,11 @@ ccm-cms
 # Content assets
 ccm-cms-assets-fileattachment
 ccm-cms-assets-imagestep
-## ccm-cms-assets-notes
+ccm-cms-assets-notes
 ccm-cms-assets-relatedlink
-# is ldn-dublin really an asset?
+
-ccm-ldn-dublin
+# is ccm-ldn-dublin really an asset?
+## -- ccm-ldn-dublin
 
 # Content types
 ccm-cms-types-address
@@ -20,8 +23,8 @@ ccm-cms-types-esdservice
 ccm-cms-types-event
 ccm-cms-types-faqitem
 ccm-cms-types-filestorageitem
-ccm-cms-types-formsectionitem
 ccm-cms-types-formitem
+ccm-cms-types-formsectionitem
 ccm-cms-types-glossaryitem
 ccm-cms-types-htmlform
 ccm-cms-types-inlinesite
@@ -33,27 +36,39 @@ ccm-cms-types-mparticle
 ccm-cms-types-newsitem
 ccm-cms-types-organization
 ccm-cms-types-pressrelease
-ccm-cms-types-service
+# siteproxy is required by ccm-ldn-atoz
 ccm-cms-types-siteproxy
 ccm-cms-types-xmlfeed
 
 # Applications
-ccm-ldn-util
+# ------------
+ccm-auth-http
+ccm-bookmarks
+ccm-formbuilder-pdf
+ccm-forum
+ccm-forum-categorised
+ccm-portalserver
+ccm-portalworkspace
+ccm-simplesurvey
+ccm-themedirector
+ccm-user-preferences
+ccm-weblog
+
+# ldn extensions
+# --------------
 ccm-ldn-atoz
-ccm-ldn-rss
+ccm-ldn-dublin
-ccm-ldn-portal
+ccm-ldn-exporter
+ccm-ldn-freeform
+ccm-ldn-importer
 ccm-ldn-navigation
+ccm-ldn-rss
 ccm-ldn-search
 ccm-ldn-shortcuts
 ccm-ldn-subsite
 ccm-ldn-terms
+ccm-ldn-util
+
+# integration layer
 ccm-ldn-aplaws
-ccm-formbuilder-pdf
+
-ccm-ldn-freeform
-ccm-user-preferences
-ccm-forum
-ccm-simplesurvey
-ccm-auth-http
-ccm-ldn-importer
-ccm-ldn-exporter
-ccm-ldn-theme

ccm-ldn-aplaws/bundles/complete/cfg/integration.properties

@@ -1,37 +1,160 @@
+# Complete bundle integration.properties
+#
+waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
+#
+; dhtml editor to use (system wide)
+; Xinha is default
+; waf.bebop.dhtml_editor=Xinha
+; waf.bebop.dhtml_editor=FCKeditor
+
+waf.categorization.show_internal_name=true
+waf.categorization.supported_languages=de,en
+
+waf.dispatcher.default_expiry=3600
+;
+waf.kernel.data_permission_check_enabled=false
+waf.kernel.primary_user_identifier=email
+; if you activate screen_name, forum loader doesn't work.
+; waf.kernel.primary_user_identifier=screen_name
+waf.kernel.supported_languages=de,en
+
+; security.properties:
+waf.auto_registration_on=false
+
+# MOVED to ui.Config
+#waf.pagemap.root=portal/
+#waf.pagemap.workspace=portal/
+#waf.pagemap.login_redirect=content/content-center-redirect.jsp
+
+; Searches for localized style sheet (among others) 
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
 waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
-waf.kernel.data_permission_check_enabled=false
-waf.dispatcher.default_expiry=3600
-waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-waf.pagemap.root=portal/
-waf.pagemap.workspace=portal/
-waf.pagemap.login_redirect=content/content-center-redirect.jsp
 
-com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
+core.ui.pagemap.root_page_url=navigation/
+core.ui.pagemap.workspace_url=navigation/
+core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
+
+; workflow configuration
+waf.workflow.simple.alerts_enabled=true
+waf.workflow.simple.alerts_sender=root@localhost.localdomain
+
+; Configures the xml processing
+waf.xml.xsl_transformer=xalan
+waf.xml.activate_full_date_formatter=true
+
+# ccm-cms parameters
+
+com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+
 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
+com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
 com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+
+; Configure dhtml editor for use in cms content-center
+; Xinha is default and should work out of the box
+;com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; as a temporary measure a different configuration file which includes a link selection box for CCM items
+; and CCM images should be specified:
+com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfig.js
+
+; to use FCKeditor:
+; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
+; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; com.arsdigita.cms.dhtml_editor_hidden_buttons=
+; com.arsdigita.cms.dhtml_editor_plugins=
+
+; to use deprecated HTMLarea (NOT recommended!):
+; currently configuration is hardcoded, so the fest alternative works
+; com.arsdigita.cms.dhtml_editor_config=HTMLArea
+; com.arsdigita.cms.dhtml_editor_config=HTMLArea,/assets/htmlarea/config/Styled.js
+; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
+
 com.arsdigita.cms.disable_item_pfs=true
+
+com.arsdigita.cms.hide_admin_tabs=true
+com.arsdigita.cms.hide_folder_index_checkbox=true
+com.arsdigita.cms.hide_launch_date=true
+com.arsdigita.cms.hide_templates_tab=true
+com.arsdigita.cms.hide_timezone=true
+com.arsdigita.cms.hide_udct_ui=true
+
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
-com.arsdigita.cms.hide_templates_tab=true
+
-com.arsdigita.cms.hide_admin_tabs=true
+
-com.arsdigita.cms.hide_timezone=true
+# ccm-cms-types-event parameters
-com.arsdigita.cms.hide_launch_date=true
+com.arsdigita.cms.contenttypes.event.hide_cost=true
-com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js
+com.arsdigita.cms.contenttypes.event.hide_date_description=false
-com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
+com.arsdigita.cms.contenttypes.event.hide_event_type=true
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
+com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
+com.arsdigita.cms.contenttypes.event.use_html_date_description=false
+com.arsdigita.cms.contenttypes.event.start_year=2000
+com.arsdigita.cms.contenttypes.event.end_year_delta=5
+
+
+# ccm-cms-types-newsitem parameters
 com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
+com.arsdigita.cms.contenttypes.newsitem.start_year=2000
+com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
+
+
+# ?? Where are these used?
 com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+
 com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
-com.arsdigita.cms.hide_udct_ui=true
-com.arsdigita.cms.hide_folder_index_checkbox=true
 
+
+# Forum application
+com.arsdigita.forum.show_new_tabs=true
+com.arsdigita.forum.use_wysiwyg_editor=true
+com.arsdigita.forum.allow_quick_finish=true
+com.arsdigita.forum.disable_page_caching=true
+
+;  atoz 
 com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws
+# ccm-ldn-navigation application
-com.arsdigita.london.theme.default_theme_context=
+; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
-com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-aplaws.web.mf
+; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
+com.arsdigita.london.navigation.category_menu_show_grand_children=false
+; com.arsdigita.london.navigation.category_menu_show_nephews=false
+com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/gen-default.jsp
+
+
+# ccm-ldn-search application
 com.arsdigita.london.search.show_sponsored_links=true
 
+
+# ccm-ldn-subsite application
+com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+
+# ccm-themedirector application
+themedirector.default_theme_path=themes/static/aplaws
+
 com.arsdigita.london.cms.dublin.audience_domain=LGAL
+
+; =============================================================================================
+; runtime specific configurations
+
+waf.admin.email=webmaster@aplaws.org
+waf.admin.name.given=aplaws 
+waf.admin.name.family=Administrator
+waf.admin.password=123456
+waf.admin.password.question=12345
+waf.admin.password.answer=6
+
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
+waf.runtime.jdbc_pool_size=60
+
+waf.web.server=localhost\:8080
+
+
+# =============================================================================================
+# devel specific configurations
+#waf.debug=true
+#waf.bebop.fancy_xsl_errors=true

ccm-ldn-aplaws/bundles/complete/cfg/web.xml

@@ -15,6 +15,21 @@
   </context-param>
 
 
+  <!-- Require secure connection by redirect to host-port part
+       of parameter waf.web.secure_server               
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+  <!-- Initialize Profiler timers
+       NOT USED with standard / production                                  
+  <filter>
+    <filter-name>profiler</filter-name>
+    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
+  </filter>
+  -->
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -25,12 +40,22 @@
     <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
   </filter>
 
+<!--    NOT USED HERE
+  <filter-mapping>
+    <filter-name>secured</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>profiler</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+-->
+
+
   <filter-mapping>
     <filter-name>subsite</filter-name>
-    <url-pattern>/ccm/*</url-pattern>
-<!-- please check: with or w/o ccm?
     <url-pattern>/*</url-pattern>
--->
   </filter-mapping>
 
   <filter-mapping>
@@ -133,7 +158,6 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
-
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -180,8 +204,6 @@
   </servlet>
   <!-- module ccm-forum  -  servlet declarations END    -->  
 
-<!-- XXX hack -->
-
   <servlet>
     <servlet-name>portal-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -281,33 +303,33 @@
   </servlet>
   <!-- module ccm-ldn-terms  -  servlet declarations END   -->
 
-  <!-- module ccm-ldn-themes  -  servlet declarations BEGIN   -->
+  <!-- module ccm-themedirector  -  servlet declarations BEGIN   -->
   <servlet>
     <servlet-name>theme-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-theme</param-value>
+      <param-value>/templates/ccm-themedirector</param-value>
     </init-param>
   </servlet>
 
   <servlet>
      <servlet-name>ThemeDownload</servlet-name>
-     <servlet-class>com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet</servlet-class>
+     <servlet-class>com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>ThemePreviewServlet</servlet-name>
      <display-name>Servlet to allow admins to preview look/feel</display-name>
     <servlet-class>
-     com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet
+     com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
     </servlet-class>
     <init-param>
       <param-name>prefix</param-name>
       <param-value>/theme</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+  <!-- module ccm-themedirector  -  servlet declarations END   -->
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      MODULES SERVLET MAPPINGS SECTION
@@ -380,7 +402,7 @@
   </servlet-mapping>
   <!-- module ccm-ldn-terms  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-theme  -  servlet mappings BEGIN   -->
+  <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
   <servlet-mapping>
     <servlet-name>theme-files</servlet-name>
     <url-pattern>/theme-files/*</url-pattern>
@@ -395,7 +417,7 @@
     <servlet-name>ThemePreviewServlet</servlet-name>
     <url-pattern>/theme/*</url-pattern>
   </servlet-mapping>
-  <!-- module ccm-ldn-themes  -  servlet mappings END   -->
+  <!-- module ccm-themedirector  -  servlet mappings END   -->
 
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

ccm-ldn-aplaws/bundles/devel/bundle.in

@@ -1,4 +1,4 @@
 BUNDLE_NAME=aplaws-plus-devel
 BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle"
-VERSION=1.0.5devel
+VERSION=1.1.3devel
 RELEASE=1

ccm-ldn-aplaws/bundles/devel/cfg/applications.cfg

@@ -7,34 +7,64 @@ ccm-cms
 
 # Content assets
 ccm-cms-assets-fileattachment
-## ccm-cms-assets-imagestep
+ccm-cms-assets-imagestep
 ## ccm-cms-assets-notes
 ccm-cms-assets-relatedlink
+
 # is ldn-dublin really an asset?
 ccm-ldn-dublin
 
 # Content types
+#ccm-cms-types-address
+#ccm-cms-types-agenda
 ccm-cms-types-article
+#ccm-cms-types-bookmark
 ccm-cms-types-contact
 # esdservice needs ccm-cms-types-contact or ccm-ldn-ccm-types-contact
 # not decided yet which one to choose
-# ccm-cms-types-esdservice
+ccm-cms-types-esdservice
+#ccm-cms-types-event
+#ccm-cms-types-faqitem
 ccm-cms-types-filestorageitem
 ccm-cms-types-formitem
 ccm-cms-types-formsectionitem
+# ccm-cms-types-glossaryitem
+# ccm-cms-types-htmlform
 ccm-cms-types-inlinesite
+#ccm-cms-types-job
+#ccm-cms-types-legalnotice
+#ccm-cms-types-minutes
+#ccm-cms-types-motditem
 ccm-cms-types-mparticle
 ccm-cms-types-newsitem
+#ccm-cms-types-organization
 ccm-cms-types-pressrelease
 # siteproxy is required by ccm-ldn-atoz
 ccm-cms-types-siteproxy
 ccm-cms-types-xmlfeed
 
 # Applications
-ccm-ldn-aplaws
+# ------------
+#ccm-auth-http
+#ccm-bookmarks
+#ccm-formbuilder-pdf
+ccm-forum
+# ccm-forum-categorised
+#ccm-portalserver
+ccm-portalworkspace
+# ccm-simplesurvey
+ccm-themedirector
+#ccm-user-preferences
+#ccm-weblog
+
+# ldn extensions
+# --------------
 ccm-ldn-atoz
+ccm-ldn-dublin
+ccm-ldn-exporter
+ccm-ldn-freeform
+ccm-ldn-importer
 ccm-ldn-navigation
-ccm-ldn-portal
 ccm-ldn-rss
 ccm-ldn-search
 ccm-ldn-shortcuts
@@ -42,7 +72,6 @@ ccm-ldn-subsite
 ccm-ldn-terms
 ccm-ldn-util
 
-# Extra apps
+# integration layer
-ccm-forum
+ccm-ldn-aplaws
-ccm-ldn-importer
+
-ccm-ldn-theme

ccm-ldn-aplaws/bundles/devel/cfg/integration.properties

@@ -1,54 +1,160 @@
+# Devel bundle intgegration.properties
+#
+waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
+#
+; dhtml editor to use (system wide)
+; Xinha is default
+; waf.bebop.dhtml_editor=Xinha
+; waf.bebop.dhtml_editor=FCKeditor
+
+waf.categorization.show_internal_name=true
+waf.categorization.supported_languages=de,en
+
+waf.dispatcher.default_expiry=3600
+;
+waf.kernel.data_permission_check_enabled=false
+waf.kernel.primary_user_identifier=email
+; if you activate screen_name, forum loader doesn't work.
+; waf.kernel.primary_user_identifier=screen_name
+waf.kernel.supported_languages=de,en
+
+; security.properties:
+;waf.auto_registration_on=false
+
+# MOVED to ui.Config
+#waf.pagemap.root=portal/
+#waf.pagemap.workspace=portal/
+#waf.pagemap.login_redirect=content/content-center-redirect.jsp
+
+; Searches for localized style sheet (among others) 
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
 waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
-waf.kernel.data_permission_check_enabled=false
-waf.dispatcher.default_expiry=3600
-waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-waf.pagemap.root=portal/
-waf.pagemap.workspace=portal/
-waf.pagemap.login_redirect=content/content-center-redirect.jsp
 
-com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
+core.ui.pagemap.root_page_url=navigation/
+core.ui.pagemap.workspace_url=navigation/
+core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
+
+; workflow configuration
+waf.workflow.simple.alerts_enabled=true
+waf.workflow.simple.alerts_sender=root@localhost.localdomain
+
+; Configures the xml processing
+waf.xml.xsl_transformer=xalan
+waf.xml.activate_full_date_formatter=true
+
+# ccm-cms parameters
+
+com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+
 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
+com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
 com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+
+; Configure dhtml editor for use in cms content-center
+; Xinha is default and should work out of the box
+;com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; as a temporary measure a different configuration file which includes a link selection box for CCM items
+; and CCM images should be specified:
+com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfig.js
+
+; to use FCKeditor:
+; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
+; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; com.arsdigita.cms.dhtml_editor_hidden_buttons=
+; com.arsdigita.cms.dhtml_editor_plugins=
+
+; to use deprecated HTMLarea (NOT recommended!):
+; currently configuration is hardcoded, so the fest alternative works
+; com.arsdigita.cms.dhtml_editor_config=HTMLArea
+; com.arsdigita.cms.dhtml_editor_config=HTMLArea,/assets/htmlarea/config/Styled.js
+; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
+
 com.arsdigita.cms.disable_item_pfs=true
+
+com.arsdigita.cms.hide_admin_tabs=true
+com.arsdigita.cms.hide_folder_index_checkbox=true
+com.arsdigita.cms.hide_launch_date=true
+com.arsdigita.cms.hide_templates_tab=true
+com.arsdigita.cms.hide_timezone=true
+com.arsdigita.cms.hide_udct_ui=true
+
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
-com.arsdigita.cms.hide_templates_tab=true
-com.arsdigita.cms.hide_admin_tabs=true
-com.arsdigita.cms.hide_timezone=true
-com.arsdigita.cms.hide_launch_date=true
-com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js
-com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
-com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
-com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
-com.arsdigita.cms.hide_udct_ui=true
-com.arsdigita.cms.hide_folder_index_checkbox=true
 
+
+# ccm-cms-types-event parameters
+com.arsdigita.cms.contenttypes.event.hide_cost=true
+com.arsdigita.cms.contenttypes.event.hide_date_description=false
+com.arsdigita.cms.contenttypes.event.hide_event_type=true
+com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
+com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
+com.arsdigita.cms.contenttypes.event.use_html_date_description=false
+com.arsdigita.cms.contenttypes.event.start_year=2000
+com.arsdigita.cms.contenttypes.event.end_year_delta=5
+
+
+# ccm-cms-types-newsitem parameters
+com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
+com.arsdigita.cms.contenttypes.newsitem.start_year=2000
+com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
+
+
+# ?? Where are these used?
+com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+
+; com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
+
+
+# Forum application
+com.arsdigita.forum.show_new_tabs=true
+com.arsdigita.forum.use_wysiwyg_editor=true
+com.arsdigita.forum.allow_quick_finish=true
+com.arsdigita.forum.disable_page_caching=true
+
+;  atoz currently not in use
 com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+# ccm-ldn-navigation application
+; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
+; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
+com.arsdigita.london.navigation.category_menu_show_grand_children=false
+; com.arsdigita.london.navigation.category_menu_show_nephews=false
+com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/gen-default.jsp
+
+
+# ccm-ldn-search application
+com.arsdigita.london.search.show_sponsored_links=true
+
+
+# ccm-ldn-subsite application
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws
+
-com.arsdigita.london.theme.default_theme_context=
+# ccm-themedirector application
-com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-aplaws.web.mf
+themedirector.default_theme_path=themes/static/aplaws
-com.arsdigita.london.search.show_sponsored_links=true
 
 com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
 ; =============================================================================================
-; devel specific configurations
+; runtime specific configurations
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
-waf.runtime.jdbc_pool_size=80
 
-waf.web.server=localhost\:8080
+waf.admin.email=webmaster@aplaws.org
-
+waf.admin.name.given=aplaws 
-waf.admin.email=admin@example.com
+waf.admin.name.family=Administrator
-waf.admin.name.given=Administrator
-waf.admin.name.family=Account
 waf.admin.password=123456
 waf.admin.password.question=12345
 waf.admin.password.answer=6
 
-com.arsdigita.aplaws.lite_load=true
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
+waf.runtime.jdbc_pool_size=60
+
+waf.web.server=localhost\:8080
+
+
+# =============================================================================================
+# devel specific configurations
 waf.debug=true
 waf.bebop.fancy_xsl_errors=true

ccm-ldn-aplaws/bundles/devel/cfg/web.xml

@@ -15,6 +15,21 @@
   </context-param>
 
 
+  <!-- Require secure connection by redirect to host-port part
+       of parameter waf.web.secure_server               
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+  <!-- Initialize Profiler timers
+       NOT USED with standard / production                                  
+  <filter>
+    <filter-name>profiler</filter-name>
+    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
+  </filter>
+  -->
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -25,12 +40,22 @@
     <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
   </filter>
 
+<!--    NOT USED HERE
+  <filter-mapping>
+    <filter-name>secured</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>profiler</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+-->
+
+
   <filter-mapping>
     <filter-name>subsite</filter-name>
-    <url-pattern>/ccm/*</url-pattern>
-<!-- please check: with or w/o ccm?
     <url-pattern>/*</url-pattern>
--->
   </filter-mapping>
 
   <filter-mapping>
@@ -133,7 +158,6 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
-
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -180,8 +204,6 @@
   </servlet>
   <!-- module ccm-forum  -  servlet declarations END    -->  
 
-<!-- XXX hack -->
-
   <servlet>
     <servlet-name>portal-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -281,33 +303,33 @@
   </servlet>
   <!-- module ccm-ldn-terms  -  servlet declarations END   -->
 
-  <!-- module ccm-ldn-themes  -  servlet declarations BEGIN   -->
+  <!-- module ccm-themedirector  -  servlet declarations BEGIN   -->
   <servlet>
     <servlet-name>theme-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-theme</param-value>
+      <param-value>/templates/ccm-themedirector</param-value>
     </init-param>
   </servlet>
 
   <servlet>
      <servlet-name>ThemeDownload</servlet-name>
-     <servlet-class>com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet</servlet-class>
+     <servlet-class>com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>ThemePreviewServlet</servlet-name>
      <display-name>Servlet to allow admins to preview look/feel</display-name>
     <servlet-class>
-     com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet
+     com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
     </servlet-class>
     <init-param>
       <param-name>prefix</param-name>
       <param-value>/theme</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+  <!-- module ccm-themedirector  -  servlet declarations END   -->
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      MODULES SERVLET MAPPINGS SECTION
@@ -380,7 +402,7 @@
   </servlet-mapping>
   <!-- module ccm-ldn-terms  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-theme  -  servlet mappings BEGIN   -->
+  <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
   <servlet-mapping>
     <servlet-name>theme-files</servlet-name>
     <url-pattern>/theme-files/*</url-pattern>
@@ -395,7 +417,7 @@
     <servlet-name>ThemePreviewServlet</servlet-name>
     <url-pattern>/theme/*</url-pattern>
   </servlet-mapping>
-  <!-- module ccm-ldn-themes  -  servlet mappings END   -->
+  <!-- module ccm-themedirector  -  servlet mappings END   -->
 
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -478,7 +500,6 @@
      <url-pattern>/print/*</url-pattern>
  </servlet-mapping>
 
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      ERROR PAGES
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

ccm-ldn-aplaws/bundles/standard/bundle.in

@@ -1,4 +1,4 @@
 BUNDLE_NAME=aplaws-plus-standard
 BUNDLE_PRETTY_NAME="APLAWS+ Standard Bundle"
-VERSION=1.0.5devel
+VERSION=1.1.3
 RELEASE=1

ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg

@@ -7,15 +7,21 @@ ccm-cms
 
 # Content assets
 ccm-cms-assets-fileattachment
-## ccm-cms-assets-imagestep
+ccm-cms-assets-imagestep
 ## ccm-cms-assets-notes
 ccm-cms-assets-relatedlink
+
 # is ldn-dublin really an asset?
 ccm-ldn-dublin
 
 # Content types
+#ccm-cms-types-address
+#ccm-cms-types-agenda
 ccm-cms-types-article
+#ccm-cms-types-bookmark
 ccm-cms-types-contact
+# esdservice needs ccm-cms-types-contact or ccm-ldn-ccm-types-contact
+# not decided yet which one to choose
 ccm-cms-types-esdservice
 ccm-cms-types-filestorageitem
 ccm-cms-types-formitem
@@ -29,10 +35,27 @@ ccm-cms-types-siteproxy
 ccm-cms-types-xmlfeed
 
 # Applications
-ccm-ldn-aplaws
+# ------------
+#ccm-auth-http
+#ccm-bookmarks
+#ccm-formbuilder-pdf
+ccm-forum
+# ccm-forum-categorised
+#ccm-portalserver
+ccm-portalworkspace
+# ccm-simplesurvey
+ccm-themedirector
+#ccm-user-preferences
+#ccm-weblog
+
+# ldn extensions
+# --------------
 ccm-ldn-atoz
+ccm-ldn-dublin
+ccm-ldn-exporter
+ccm-ldn-freeform
+ccm-ldn-importer
 ccm-ldn-navigation
-ccm-ldn-portal
 ccm-ldn-rss
 ccm-ldn-search
 ccm-ldn-shortcuts
@@ -40,7 +63,6 @@ ccm-ldn-subsite
 ccm-ldn-terms
 ccm-ldn-util
 
-# Extra apps
+# integration layer
-ccm-forum
+ccm-ldn-aplaws
-ccm-ldn-importer
+
-ccm-ldn-theme

ccm-ldn-aplaws/bundles/standard/cfg/integration.properties

@@ -1,36 +1,160 @@
+# Devel bundle intgegration.properties
+#
+waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
+#
+; dhtml editor to use (system wide)
+; Xinha is default
+; waf.bebop.dhtml_editor=Xinha
+; waf.bebop.dhtml_editor=FCKeditor
+
+waf.categorization.show_internal_name=true
+waf.categorization.supported_languages=de,en
+
+waf.dispatcher.default_expiry=3600
+;
+waf.kernel.data_permission_check_enabled=false
+waf.kernel.primary_user_identifier=email
+; if you activate screen_name, forum loader doesn't work.
+; waf.kernel.primary_user_identifier=screen_name
+waf.kernel.supported_languages=de,en
+
+; security.properties:
+;waf.auto_registration_on=false
+
+# MOVED to ui.Config
+#waf.pagemap.root=portal/
+#waf.pagemap.workspace=portal/
+#waf.pagemap.login_redirect=content/content-center-redirect.jsp
+
+; Searches for localized style sheet (among others) 
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
 waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
-waf.kernel.data_permission_check_enabled=false
-waf.dispatcher.default_expiry=3600
-waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-waf.pagemap.root=portal/
-waf.pagemap.workspace=portal/
-waf.pagemap.login_redirect=content/content-center-redirect.jsp
 
-com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
+core.ui.pagemap.root_page_url=navigation/
+core.ui.pagemap.workspace_url=navigation/
+core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
+
+; workflow configuration
+waf.workflow.simple.alerts_enabled=true
+waf.workflow.simple.alerts_sender=root@localhost.localdomain
+
+; Configures the xml processing
+waf.xml.xsl_transformer=xalan
+waf.xml.activate_full_date_formatter=true
+
+# ccm-cms parameters
+
+com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+
 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
+com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
 com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+
+; Configure dhtml editor for use in cms content-center
+; Xinha is default and should work out of the box
+;com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; as a temporary measure a different configuration file which includes a link selection box for CCM items
+; and CCM images should be specified:
+com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfig.js
+
+; to use FCKeditor:
+; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
+; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; com.arsdigita.cms.dhtml_editor_hidden_buttons=
+; com.arsdigita.cms.dhtml_editor_plugins=
+
+; to use deprecated HTMLarea (NOT recommended!):
+; currently configuration is hardcoded, so the fest alternative works
+; com.arsdigita.cms.dhtml_editor_config=HTMLArea
+; com.arsdigita.cms.dhtml_editor_config=HTMLArea,/assets/htmlarea/config/Styled.js
+; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
+
 com.arsdigita.cms.disable_item_pfs=true
+
+com.arsdigita.cms.hide_admin_tabs=true
+com.arsdigita.cms.hide_folder_index_checkbox=true
+com.arsdigita.cms.hide_launch_date=true
+com.arsdigita.cms.hide_templates_tab=true
+com.arsdigita.cms.hide_timezone=true
+com.arsdigita.cms.hide_udct_ui=true
+
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
-com.arsdigita.cms.hide_templates_tab=true
+
-com.arsdigita.cms.hide_admin_tabs=true
+
-com.arsdigita.cms.hide_timezone=true
+# ccm-cms-types-event parameters
-com.arsdigita.cms.hide_launch_date=true
+com.arsdigita.cms.contenttypes.event.hide_cost=true
-com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js
+com.arsdigita.cms.contenttypes.event.hide_date_description=false
-com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
+com.arsdigita.cms.contenttypes.event.hide_event_type=true
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
+com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
+com.arsdigita.cms.contenttypes.event.use_html_date_description=false
+com.arsdigita.cms.contenttypes.event.start_year=2000
+com.arsdigita.cms.contenttypes.event.end_year_delta=5
+
+
+# ccm-cms-types-newsitem parameters
 com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
+com.arsdigita.cms.contenttypes.newsitem.start_year=2000
+com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
+
+
+# ?? Where are these used?
 com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
-com.arsdigita.cms.hide_udct_ui=true
-com.arsdigita.cms.hide_folder_index_checkbox=true
 
+; com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
+
+
+# Forum application
+com.arsdigita.forum.show_new_tabs=true
+com.arsdigita.forum.use_wysiwyg_editor=true
+com.arsdigita.forum.allow_quick_finish=true
+com.arsdigita.forum.disable_page_caching=true
+
+;  atoz currently not in use
 com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws
+# ccm-ldn-navigation application
-com.arsdigita.london.theme.default_theme_context=
+; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
-com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-aplaws.web.mf
+; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
+com.arsdigita.london.navigation.category_menu_show_grand_children=false
+; com.arsdigita.london.navigation.category_menu_show_nephews=false
+com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/gen-default.jsp
+
+
+# ccm-ldn-search application
 com.arsdigita.london.search.show_sponsored_links=true
 
+
+# ccm-ldn-subsite application
+com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+
+# ccm-themedirector application
+themedirector.default_theme_path=themes/static/aplaws
+
 com.arsdigita.london.cms.dublin.audience_domain=LGAL
+
+; =============================================================================================
+; runtime specific configurations
+
+waf.admin.email=webmaster@aplaws.org
+waf.admin.name.given=aplaws 
+waf.admin.name.family=Administrator
+waf.admin.password=123456
+waf.admin.password.question=12345
+waf.admin.password.answer=6
+
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
+waf.runtime.jdbc_pool_size=60
+
+waf.web.server=localhost\:8080
+
+
+# =============================================================================================
+# devel specific configurations
+waf.debug=true
+waf.bebop.fancy_xsl_errors=true

ccm-ldn-aplaws/bundles/standard/cfg/web.xml

@@ -15,6 +15,21 @@
   </context-param>
 
 
+  <!-- Require secure connection by redirect to host-port part
+       of parameter waf.web.secure_server               
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+  <!-- Initialize Profiler timers
+       NOT USED with standard / production                                  
+  <filter>
+    <filter-name>profiler</filter-name>
+    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
+  </filter>
+  -->
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -25,12 +40,22 @@
     <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
   </filter>
 
+<!--    NOT USED HERE
+  <filter-mapping>
+    <filter-name>secured</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>profiler</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+-->
+
+
   <filter-mapping>
     <filter-name>subsite</filter-name>
-    <url-pattern>/ccm/*</url-pattern>
-<!-- please check: with or w/o ccm?
     <url-pattern>/*</url-pattern>
--->
   </filter-mapping>
 
   <filter-mapping>
@@ -133,7 +158,6 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
-
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -180,8 +204,6 @@
   </servlet>
   <!-- module ccm-forum  -  servlet declarations END    -->  
 
-<!-- XXX hack -->
-
   <servlet>
     <servlet-name>portal-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -281,33 +303,33 @@
   </servlet>
   <!-- module ccm-ldn-terms  -  servlet declarations END   -->
 
-  <!-- module ccm-ldn-themes  -  servlet declarations BEGIN   -->
+  <!-- module ccm-themedirector  -  servlet declarations BEGIN   -->
   <servlet>
     <servlet-name>theme-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-theme</param-value>
+      <param-value>/templates/ccm-themedirector</param-value>
     </init-param>
   </servlet>
 
   <servlet>
      <servlet-name>ThemeDownload</servlet-name>
-     <servlet-class>com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet</servlet-class>
+     <servlet-class>com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>ThemePreviewServlet</servlet-name>
      <display-name>Servlet to allow admins to preview look/feel</display-name>
     <servlet-class>
-     com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet
+     com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
     </servlet-class>
     <init-param>
       <param-name>prefix</param-name>
       <param-value>/theme</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+  <!-- module ccm-themedirector  -  servlet declarations END   -->
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      MODULES SERVLET MAPPINGS SECTION
@@ -380,7 +402,7 @@
   </servlet-mapping>
   <!-- module ccm-ldn-terms  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-theme  -  servlet mappings BEGIN   -->
+  <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
   <servlet-mapping>
     <servlet-name>theme-files</servlet-name>
     <url-pattern>/theme-files/*</url-pattern>
@@ -395,7 +417,7 @@
     <servlet-name>ThemePreviewServlet</servlet-name>
     <url-pattern>/theme/*</url-pattern>
   </servlet-mapping>
-  <!-- module ccm-ldn-themes  -  servlet mappings END   -->
+  <!-- module ccm-themedirector  -  servlet mappings END   -->
 
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -478,7 +500,6 @@
      <url-pattern>/print/*</url-pattern>
  </servlet-mapping>
 
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      ERROR PAGES
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

ccm-ldn-aplaws/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp

@@ -11,7 +11,7 @@
     NavigationModel model = new CMSNavigationModel();
   </jsp:declaration>
 
-  <define:page name="itemPage" application="content" 
+  <define:page name="itemPage" application="content-section" 
     title="APLAWS" cache="true">
 
     <define:component name="categoryPath"

ccm-ldn-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt

@@ -12,26 +12,36 @@ http://::host::/__ccm__/servlet/content-item/index.xsl?oid=::item_template_oid::
 
 # added by Quasimodo
 # Theme with single entry point (e.g Mandalay)
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/start.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/start.xsl
 
 # Theme, with optional locale & prefix
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
 
 # Theme, with optional locale
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
 
 # APLAWS default, with locale and prefix
 # XXX change ROOT -> ccm-ldn-aplaws
+http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::prefix::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::-::locale::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::.xsl
 
 # APLAWS default, with locale
 # XXX change ROOT -> ccm-ldn-aplaws
+http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::locale::.xsl
+http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::locale::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::.xsl
 
 # Global default, from application's own web app
 http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::locale::.xsl
 http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::.xsl
+
+# Global default, from application's own web app - relocated version >= 6.6.1
+http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::.xsl
+http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl

ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java

@@ -57,6 +57,9 @@ import org.apache.log4j.Logger;
 /**
  * Loader.
  *
+ * Creates category domains in the terms application according to 
+ * configuration files and adds jsp templates to navigation.
+ *
  * @author Justin Ross <jross@redhat.com>
  * @version $Id: Loader.java 755 2005-09-02 13:42:47Z sskracic $
  */
@@ -313,7 +316,7 @@ public class Loader extends PackageLoader {
                         " in context " + context);
         }
 
-        Domain domain = Domain.retrieve(domainKey);
+        Domain domain = Domain.retrieve(domainKey);  // package com.arsdigita.london.terms
         Application app = Application.retrieveApplicationForPath(appURL);
         domain.setAsRootForObject(app, context);
         if (app instanceof ContentSection) {
@@ -322,8 +325,8 @@ public class Loader extends PackageLoader {
             Set categorizeRoles = new HashSet();
             while (coll.next()) {
                 Role role = coll.getRole();
-                final DataQuery privs = RoleFactory.getRolePrivileges
+                final DataQuery privs = RoleFactory.getRolePrivileges(
-                    (app.getID(), role.getGroup().getID());
+                        app.getID(), role.getGroup().getID());
                 while (privs.next()) {
                     String priv = (String) privs.get(RoleFactory.PRIVILEGE);
                     if (priv.equals(SecurityManager.CMS_CATEGORY_ADMIN)) {

ccm-ldn-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java

@@ -15,6 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
+
 package com.arsdigita.aplaws;
 
 import com.arsdigita.xml.Element;
@@ -369,4 +370,5 @@ public class ObjectTypeSchemaGenerator extends ObjectTypeTraversal {
         }
         m_property = (Property) m_properties.pop();
     }
+    
 }

ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ACSObjectCategoryPicker.java

@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-package com.arsdigita.aplaws.ui;
-
-
-import com.arsdigita.aplaws.Aplaws;
-// import com.arsdigita.bebop.SimpleContainer;
-import com.arsdigita.bebop.PageState;
-import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.bebop.parameters.BigDecimalParameter;
-import com.arsdigita.bebop.event.ActionEvent;
-import com.arsdigita.bebop.event.ActionListener;
-// import com.arsdigita.bebop.form.Widget;
-// import com.arsdigita.categorization.ui.ACSObjectCategoryForm;
-// import com.arsdigita.persistence.SessionManager;
-// import com.arsdigita.persistence.DataCollection;
-// import com.arsdigita.domain.DomainCollection;
-// import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.london.terms.Term;
-import com.arsdigita.london.terms.Domain;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Iterator;
-
-import org.apache.log4j.Logger;
-
-/**
- * Extends com.arsdigita.london.terms.ui.ACSObjectCategoryPicker and overwrites
- * the private class ItemCategoryFormCompletion to add functionality to its
- * lgclSelected() method.
- * 
- */
-public abstract class ACSObjectCategoryPicker
-                extends com.arsdigita.london.terms.ui.ACSObjectCategoryPicker{
-
-    private static final Logger s_log = Logger.getLogger(ACSObjectCategoryPicker.class);
-
-    /**
-     * Constructor
-     * 
-     * @param root
-     * @param mode
-     */
-    public ACSObjectCategoryPicker(BigDecimalParameter root,
-            StringParameter mode) {
-        super(root,mode);
-    }
-
-
-    /**
-     * Overwrites private class of the parent class to add functionality for
-     * processing or mapping from LGCL to APLAWS-NAV in method lgclSelected().
-     */
-    private class ItemCategoryFormCompletion implements ActionListener {
-
-        public void actionPerformed(ActionEvent ev) {
-
-            PageState state = ev.getPageState();
-            Domain domain = getDomain(state);
-            String domainKey = domain.getKey();
-
-            if (s_log.isDebugEnabled()) {
-                s_log.debug("Saving categories in: " + domainKey);
-            }
-
-			ACSObject object = getObject(state);
-
-            if ("LGCL".equals(domainKey)) {
-                lgclSelected(domain, object);
-            }
-
-            else if ("LGDL".equals(domainKey)) {
-                lgdlSelected(domain, object);
-            }
-
-            fireCompletionEvent(state);
-        }
-
-        /**
-         * Adds processing or mapping from LGCL to APLAWS-NAV too.
-         *
-         * ANav and the corresponding configuration parameter in module
-         * ccm-ldn-aplaws are highly specific to the needs of British Local
-         * Authorities and should not be used in more general parts of the
-         * code.
-         * 
-         * @param domain
-         * @param object
-         */
-        private void lgclSelected(Domain domain, ACSObject object) {
-            List lgclTerms = getCurrentCategories(domain, object);
-
-            Domain gcl = Domain.retrieve("GCL");
-            Collection gclTerms = getRelatedTerms(lgclTerms, gcl);
-            clearTerms(gcl, object);
-            assignTerms(gclTerms, object);
-
-            // The assignment below is removed to satisfy requirement 4.1,
-            // use case 1 of the document "Metadata Improvements" version 1
-            // by Camden, dated 23/01/05.
-            //Domain lgsl = Domain.retrieve("LGSL");
-            //Collection lgslTerms = getRelatedTerms(lgclTerms, lgsl);
-			//clearTerms(lgsl, object);
-			//assignTerms(lgslTerms, object);
-
-            // adding processing or mapping from LGCL to APLAWS-NAV too
-            boolean lgclOverrideAnav = Aplaws.getAplawsConfig().
-                                       getOverrideAnavFromLGCLMappings().booleanValue();
-            if (lgclOverrideAnav) {
-                Domain aplawsNav = Domain.retrieve("APLAWS-NAV");
-                Collection aplawsNavTerms = getRelatedTerms(lgclTerms, aplawsNav);
-				clearTerms(aplawsNav, object);
-				assignTerms(aplawsNavTerms, object);
-			}
-        }
-
-        // User has selected a term in the LGDL hierarchy, which includes
-        // terms from the LGSL. We're only interested in LGSL terms here.
-        private void lgdlSelected(Domain domain, ACSObject object) {
-            Domain lgsl = Domain.retrieve("LGSL");
-            Domain gcl = Domain.retrieve("GCL");
-            Domain lgcl = Domain.retrieve("LGCL");
-
-            // We have a mapping LGSL -> LGCL based on the reverse of a
-            // published mapping. We don't have a mapping LGSL -> GCL, so we
-            // do LGSL -> LGCL -> GCL instead.
-
-            List lgslTerms = getCurrentCategories(lgsl, object);
-            Collection lgclTerms = getRelatedTerms(lgslTerms, lgcl);
-
-            LinkedList lgclIDs = new LinkedList();
-            Iterator i = lgclTerms.iterator();
-            while (i.hasNext()) {
-                Term term = (Term) i.next();
-                lgclIDs.add(term.getModel().getID());
-            }
-
-            Collection gclTerms = getRelatedTerms(lgclIDs, gcl);
-
-            clearTerms(lgcl, object);
-            assignTerms(lgclTerms, object);
-
-            clearTerms(gcl, object);
-            assignTerms(gclTerms, object);
-        }
-    }
-
-
-}

ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategorySubtree.java.nolongerInUse

@@ -15,7 +15,6 @@ import com.arsdigita.bebop.SimpleComponent;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.london.terms.ui.TermWidget;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.xml.Element;
 
@@ -23,7 +22,7 @@ import com.arsdigita.xml.Element;
  * Generate part of the category tree. Used by Assign Category authoring step.
  * 
  * @author Alan Pevec
- * @deprecated use  com.arsdigita.london.terms.ui.CategorySubtree  instead!
+ * @deprecated use com.arsdigita.london.terms.ui.CategorySubtree  instead.
  */
 public class CategorySubtree extends SimpleComponent {
 
@@ -31,14 +30,12 @@ public class CategorySubtree extends SimpleComponent {
     
 	private static Logger s_log = Logger.getLogger(CategorySubtree.class);
 
-    @Override
     public void register(Page p) {
         super.register(p);
         p.addGlobalStateParam(nodeIDparam);
        
     }
 
-    @Override
     public void generateXML(PageState state, Element p) {
     	
     	String node = (String)state.getValue(nodeIDparam);

ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java

@@ -22,9 +22,15 @@ import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.parameters.ParameterModel;
 import com.arsdigita.domain.DomainObject;
 
+import org.apache.log4j.Logger;
+
 public class HomepagePortalSelectionModel extends AbstractSingleSelectionModel
     implements PortalSelectionModel {
 
+    /** Private logger instance for debugging  */
+    private static Logger s_log = Logger.getLogger(
+                                  HomepagePortalSelectionModel.class);
+
     private HomepageWorkspaceSelectionModel m_workspace;
     private int m_column;
 
@@ -32,6 +38,13 @@ public class HomepagePortalSelectionModel extends AbstractSingleSelectionModel
                                         int column) {
         m_workspace = workspace;
         m_column = column;
+
+        if (s_log.isDebugEnabled()) {
+            s_log.debug("Constructor HomepageWorkspaceSelectionModel " + " [" +
+                        "Workspace: " + m_workspace + "," +
+                        "Columns: " + column +  "]");
+        }
+
     }
 
     public void onCustomize(PageState state) {

ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java

@@ -18,22 +18,32 @@ package com.arsdigita.aplaws.ui;
 import com.arsdigita.bebop.SimpleContainer;
 import com.arsdigita.bebop.ActionLink;
 import com.arsdigita.bebop.Page;
-import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.event.ActionEvent;
 import com.arsdigita.bebop.event.ActionListener;
+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.Party;
 import com.arsdigita.kernel.Kernel;
-import com.arsdigita.portalworkspace.ui.PersistentPortal;
+import com.arsdigita.kernel.Party;
-import com.arsdigita.portalworkspace.ui.PortalConstants;
+
-import com.arsdigita.portalworkspace.Workspace;
+import org.apache.log4j.Logger;
-import com.arsdigita.xml.Element;
 
 
+/** 
+ * 
+ * 
+ */
 public class HomepageWorkspace extends SimpleContainer {
     
+    /** Private logger instance for debugging  */
+    private static Logger s_log = Logger.getLogger(
+                                  HomepageWorkspace.class);
+
     private HomepagePortalSelectionModel m_model;
     private ActionLink m_reset;
     private ActionLink m_browse;
@@ -47,10 +57,19 @@ public class HomepageWorkspace extends SimpleContainer {
     public HomepageWorkspace() {
         super("portal:homepageWorkspace", PortalConstants.PORTAL_XML_NS);
         m_customizable = false;
+
+        if (s_log.isDebugEnabled()) {
+            s_log.debug("Constructor HomepageWorkspace finished. " );
+        }
+
     }
     
     public void setModel(HomepagePortalSelectionModel model) {
         m_model = model;
+
+        if (s_log.isDebugEnabled()) {
+            s_log.debug("setModel: " + m_model );
+        }
     }
     
     public void setCustomizable(boolean customizable) {

ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java

@@ -43,6 +43,7 @@ import com.arsdigita.london.terms.ui.TermWidget;
 
 
 public class ItemCategoryPicker extends ACSObjectCategoryPicker {
+
     private static final Logger s_log = Logger.getLogger(ItemCategoryPicker.class);
 
    
@@ -59,7 +60,8 @@ public class ItemCategoryPicker extends ACSObjectCategoryPicker {
                          com.arsdigita.bebop.parameters.BigDecimalParameter, 
                          com.arsdigita.bebop.parameters.StringParameter)
      */
-    protected ACSObjectCategoryForm getForm(BigDecimalParameter root, StringParameter mode) {
+    protected ACSObjectCategoryForm getForm(BigDecimalParameter root,
+                                            StringParameter mode) {
         s_log.debug("getForm");
         return new ItemCategoryForm(root, mode, new TermWidget(mode, this));
     }

ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/SimplePage.java

@@ -25,7 +25,14 @@ import com.arsdigita.xml.Document;
 import com.arsdigita.xml.Element;
 import com.arsdigita.web.Web;
 
-
+/**
+ * <p>
+ * Special implementation of <code>com.arsdigita.ui.SimplePage</code> as 
+ * the base page to serve bebop pages.</p>
+ *
+ * <p>Activated by pointing the parameter <code>waf.bebop.base_page</code> 
+ * to it.</p>
+ */
 public class SimplePage extends com.arsdigita.ui.SimplePage {
 
     public SimplePage(String application,
@@ -39,6 +46,14 @@ public class SimplePage extends com.arsdigita.ui.SimplePage {
                                      Document parent) {
         Element page = super.generateXMLHelper(state, parent);
         
+        /*
+         * TODO: What specific funcionality is added here and what is
+         * its purpose and why is the bebop standard implementation
+         * insufficient.
+         *
+         * Two xml attributes are added in addition to the bebop standard
+         * implementation.
+         */
         if (Web.getContext().getRequestURL() != null) {
             page.addAttribute("url", Web.getContext().getRequestURL().toString());
             

ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws

@@ -15,6 +15,23 @@
   </context-param>
 
 
+  <!-- Require secure connection by redirect to host-port part
+       of parameter waf.web.secure_server               
+       NOT USED with ZeS                                        
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+  <!-- Initialize Profiler timers
+       NOT USED with ZeS standard / production                                  
+  <filter>
+    <filter-name>profiler</filter-name>
+    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
+  </filter>
+  -->
+
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -25,6 +42,20 @@
     <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
   </filter>
 
+
+<!--    NOT USED HERE
+  <filter-mapping>
+    <filter-name>secured</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>profiler</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+-->
+
+
   <filter-mapping>
     <filter-name>subsite</filter-name>
     <url-pattern>/*</url-pattern>
@@ -177,14 +208,12 @@
   </servlet>
   <!-- module ccm-forum  -  servlet declarations END    -->  
 
-<!-- XXX hack -->
-
   <servlet>
-    <servlet-name>portal-files</servlet-name>
+    <servlet-name>portalworkspace-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-portal</param-value>
+      <param-value>/templates/ccm-portalworkspace</param-value>
     </init-param>
   </servlet>
 
@@ -330,8 +359,8 @@
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>portal-files</servlet-name>
+    <servlet-name>portalworkspace-files</servlet-name>
-    <url-pattern>/ccm-ldn-portal/files/*</url-pattern>
+    <url-pattern>/ccm-portalworkspace/files/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>

ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-index.css

@@ -1,2 +0,0 @@
-@import url("/css/acs-master.css");
-@import url("/__ccm__/static/forum/forum.css");

ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-index.xsl

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-  version="1.0">
-
-  <!-- IMPORT DEFINITIONS ccm-forum installed as separate web application ccm-forum
-  <xsl:import href="../../../../ccm-forum/__ccm__/apps/forum/xsl/index.xsl"/>
-  -->
-  <!-- IMPORT DEFINITIONS ccm-ldn-shortcuts installed into the main CCM webapp
-  -->
-  <xsl:import href="../../../__ccm__/apps/forum/xsl/index.xsl"/>
-
-  <xsl:import href="lib/page.xsl"/>
-
-  <xsl:param name="theme-prefix" />
-
-  <xsl:template name="aplaws:headerStyleSheets">
-    <link rel="stylesheet" href="{$theme-prefix}/forum-index.css" type="text/css" media="screen"/>
-  </xsl:template>
-
-</xsl:stylesheet>

ccm-ldn-aplaws/web/__ccm__/themes/aplaws/navigation-admin.css

@@ -1,2 +0,0 @@
-@import url("/css/acs-master.css");
-@import url("/__ccm__/apps/navigation/xsl/admin.css");

ccm-ldn-aplaws/web/__ccm__/themes/aplaws/navigation-index.xsl

@@ -1,18 +0,0 @@
-<?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"
- 
-  exclude-result-prefixes="xsl bebop aplaws ui cms nav"
-  version="1.0">
-
-  <xsl:import href="../../../../ROOT/__ccm__/apps/navigation/xsl/index.xsl"/>
-  
-	
-	<xsl:import href="content-section-index.xsl"/>
-
-</xsl:stylesheet>

ccm-ldn-aplaws/web/__ccm__/themes/aplaws/navigation-services.xsl

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-  version="1.0">
-
-  <xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../../ROOT/packages/ui/xsl/ui.xsl"/>
-  <xsl:import href="lib/page.xsl"/>
-
-  <xsl:param name="theme-prefix" />
-
-  <xsl:template name="aplaws:headerStyleSheets">
-    <!--
-    <link rel="stylesheet" href="{$theme-prefix}/forum-index.css" type="text/css" media="screen"/>
-    -->
-  </xsl:template>
-
-</xsl:stylesheet>

ccm-ldn-aplaws/web/assets/fckeditor/config/fckconfigOpenCCM.js

@@ -0,0 +1,137 @@
+/*
+ * FCKeditor - The text editor for internet
+ * Copyright (C) 2003-2005 Frederico Caldeira Knabben
+ * 
+ * Licensed under the terms of the GNU Lesser General Public License:
+ * 		http://www.opensource.org/licenses/lgpl-license.php
+ * 
+ * For further information visit:
+ * 		http://www.fckeditor.net/
+ * 
+ * File Name: fckconfigOpenCCM.js
+ * 	Editor configuration settings for use in admin interface in APLAWS/OpenCCM. 
+ *	This configuration is designed to match the following goals:
+ *		- Easy useage of the editor
+ *		- Clean HTML output, this means for example that no deprected elements are useable from the editor
+ *
+ * 	This file is organized in the same way as the page of the FCKEditor documentation showing all config options.
+ *	The page can be found here: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
+ * 
+ *		- Semantic HTML output. This means that elements like <em> are prefered against such as <b>	
+ *  This config is loaded from the Javascript in the calling page using AFTER the
+ *  default fckconfig.js is loaded.
+ * 
+ * File Authors:
+ * 		Chris Burnett (orginale fckeditordefaultstyle.js for APLAWS)
+ * 		Jens Pelzetter
+ */
+
+/* **************************************************************************************************************** */
+
+
+/* Editor Behavior 
+   --------------- */
+
+FCKConfig.AutoDetectPasteFromWord = false ; //Paste Word text directly to the editor (only IE)
+FCKConfig.CleanWordKeepsStructure = true ; //Prefer to keep HTML structure, not layout
+FCKConfig.DocType = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' ;
+FCKConfig.ForcePasteAsPlainText	= true ; //Text pasted in from another app will appear as plain text
+
+
+/* Styles
+   ------ */
+
+FCKConfig.StylesXmlPath = FCKConfig.EditorPath + 'config/fckconfigOpenCCM.xml' ; //Some styles
+
+/* HTML Output
+   ----------- */
+
+FCKConfig.FormatOutput = true ; //Format output code
+FCKConfig.FormatSource = true ;
+
+/* User interface
+   -------------- */
+
+FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','TableCell','Table','Form'] ;
+FCKConfig.ImageDlgHideLink	= true ;
+FCKConfig.ImageDlgHideAdvanced	= true ;
+FCKConfig.ShowDropDialog = true ;
+FCKConfig.ToolbarSets["AplawsBasic"] = [
+    ['Style','-','OrderedList','UnorderedList','Subscript', 'Superscript', '-','SpellCheck','Link','Unlink','RemoveFormat','-','ImageButton', '-', 'AdvToolbar', 'About']
+] ;
+
+FCKConfig.ToolbarSets["AplawsAdvanced"] = [
+    ['Style','-','OrderedList','UnorderedList','Subscript', 'Superscript'],
+  ['Cut','Copy','Paste','PasteText','PasteWord','Undo','Redo','RemoveFormat'],
+  ['Find','Replace','SelectAll', '-','SpellCheck'],
+  '/',
+  ['Link','Unlink','Anchor','-','Source'],
+  ['SimpleToolbar']
+] ;
+
+
+// Replace the Advanced toolbar with AplawsAdvanced & setup the Basic toolbar to use the AplawsBasic toolbar
+// The two toolbars are used to support the dynamic toolbar switching plugin.
+// Set the Default to be the Basic version so that the editor loads the basic toolbar on startup.
+
+FCKConfig.ToolbarSets["Advanced"] = FCKConfig.ToolbarSets["AplawsAdvanced"] ;
+FCKConfig.ToolbarSets["Basic"] = FCKConfig.ToolbarSets["AplawsBasic"] ;
+FCKConfig.ToolbarSets["Default"] = FCKConfig.ToolbarSets["Basic"] ;
+
+/* Advanced
+   -------- */
+FCKConfig.FirefoxSpellChecker = true ;
+FCKConfig.SpellChecker			= 'ieSpell' ;	// 'ieSpell' | 'SpellerPages'
+FCKConfig.IeSpellDownloadUrl	= 'http://www.iespell.com/rel/ieSpellSetup211325.exe' ;
+
+/* File Browser and Updoader
+   ------------------------- */
+
+FCKConfig.LinkBrowser = true ;
+FCKConfig.LinkBrowserURL = "/ccm/content/admin/search.jsp?useURL=true&widget=getElementById('txtUrl')" ;
+FCKConfig.LinkBrowserWindowWidth    = FCKConfig.ScreenWidth * 0.7 ;     // 70%
+FCKConfig.LinkBrowserWindowHeight   = FCKConfig.ScreenHeight * 0.7 ;    // 70%
+
+
+/*
+FCKConfig.ToolbarSets["AplawsBasic"] = [
+  ['Style','-','Bold','OrderedList','UnorderedList','-','SpellCheck','Link','Unlink','RemoveFormat','-','AdvToolbar']
+] ;
+
+FCKConfig.ToolbarSets["AplawsAdvanced"] = [
+  ['Style','-','Bold','OrderedList','UnorderedList'],
+  ['Cut','Copy','Paste','PasteText','PasteWord','Undo','Redo','RemoveFormat'],
+  ['Find','Replace','SelectAll', '-','SpellCheck'],
+  '/',
+  ['UniversalKey'],
+  ['Link','Unlink','Anchor','-','Source'],
+  ['SimpleToolbar']
+] ;
+
+
+// Replace the Advanced toolbar with AplawsAdvanced & setup the Basic toolbar to use the AplawsBasic toolbar
+// The two toolbars are used to support the dynamic toolbar switching plugin.
+// Set the Default to be the Basic version so that the editor loads the basic toolbar on startup.
+
+FCKConfig.ToolbarSets["Advanced"] = FCKConfig.ToolbarSets["AplawsAdvanced"] ;
+FCKConfig.ToolbarSets["Basic"] = FCKConfig.ToolbarSets["AplawsBasic"] ;
+FCKConfig.ToolbarSets["Default"] = FCKConfig.ToolbarSets["Basic"] ;
+
+
+FCKConfig.StylesXmlPath		= FCKConfig.EditorPath + 'config/fckconfigstyledefault.xml' ;
+FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','TableCell','Table','Form'] ;
+
+FCKConfig.SpellChecker			= 'ieSpell' ;	// 'ieSpell' | 'SpellerPages'
+FCKConfig.IeSpellDownloadUrl	= 'http://www.iespell.com/rel/ieSpellSetup211325.exe' ;
+
+FCKConfig.ImageDlgHideLink	= true ;
+FCKConfig.ImageDlgHideAdvanced	= true ;
+
+FCKConfig.FlashDlgHideAdvanced	= true ;
+
+FCKConfig.LinkBrowser = true ;
+FCKConfig.LinkBrowserURL = "/ccm/content/admin/search.jsp?useURL=true&widget=getElementById('txtUrl')" ;
+FCKConfig.LinkBrowserWindowWidth    = FCKConfig.ScreenWidth * 0.7 ;     // 70%
+FCKConfig.LinkBrowserWindowHeight   = FCKConfig.ScreenHeight * 0.7 ;    // 70%
+*/
+

ccm-ldn-aplaws/web/assets/fckeditor/config/fckconfigOpenCCM.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+
+<Styles>
+    <Style name="Heading 3" element="h3" />
+    <Style name="Heading 4" element="h4" />
+    <Style name="Heading 5" element="h5" />
+    <Style name="Heading 6" element="h6" />
+    <Style name="Emphasized" element="em" />
+    <Style name="Strong emphasized" element="strong" />
+    <Style name="Body Text" element="p" />
+</Styles>

ccm-ldn-aplaws/web/assets/xinha/XinhaConfig.js

@@ -0,0 +1,18 @@
+/* This compressed file is part of Xinha. For uncompressed sources, forum, and bug reports, go to xinha.org */
+/* This file is part of version 0.95 released Mon, 12 May 2008 17:33:15 +0200 */
+/* The URL of the most recent version of this file is http://svn.xinha.webfactional.com/trunk/examples/XinhaConfig.js */
+xinha_init=null;
+xinha_config=null;
+xinha_init=xinha_init?xinha_init:function(){
+xinha_editors=xinha_editors?xinha_editors:["myTextArea","anotherOne"];
+xinha_plugins=xinha_plugins?xinha_plugins:["CharacterMap","ContextMenu","SmartReplace","Stylist","Linker","SuperClean","TableOperations"];
+if(!Xinha.loadPlugins(xinha_plugins,xinha_init)){
+return;
+}
+xinha_config=xinha_config?xinha_config():new Xinha.Config();
+xinha_config.pageStyleSheets=[_editor_url+"examples/full_example.css"];
+xinha_editors=Xinha.makeEditors(xinha_editors,xinha_config,xinha_plugins);
+Xinha.startEditors(xinha_editors);
+};
+Xinha.addOnloadHandler(xinha_init);
+

ccm-ldn-aplaws/web/packages/navigation/templates/SpecializingList.jsp

@@ -0,0 +1,46 @@
+<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"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="org.apache.log4j.Logger"/>
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="false">
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+        <define:component name="itemList"
+                          classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20);
+            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true);
+        </jsp:scriptlet>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+    </define:page>
+    <show:all/>	
+</jsp:root>

ccm-ldn-aplaws/web/packages/navigation/templates/mparticle-index.jsp

@@ -0,0 +1,65 @@
+<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"/>
+  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+
+  <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+  </jsp:scriptlet>
+
+  <define:page name="defaultItemPage" application="navigation"
+    title="Navigation" cache="true">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+    <define:component name="sectionXML"
+      classname="com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel"/>
+    <jsp:scriptlet>
+        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
+        ((com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel) sectionXML).setContentItem(item);
+    </jsp:scriptlet>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
+    </jsp:scriptlet>
+
+    <define:component name="assignedTerms"
+         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+  </define:page>
+  <show:all/>
+</jsp:root>
+

ccm-ldn-aplaws/web/themes/static/aplaws/admin-index.xsl

@@ -3,8 +3,10 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
-
+<!--
   <xsl:import href="../../../../ROOT/__ccm__/apps/admin/xsl/index.xsl"/>
+  -->
+  <xsl:import href="../../heirloom/apps/admin/xsl/index.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>

ccm-ldn-aplaws/web/themes/static/aplaws/consultations-index.xsl

@@ -8,7 +8,10 @@
   xmlns:nav="http://ccm.redhat.com/london/navigation"
   version="1.0">
 
+<!--
   <xsl:import href="../../themes/aplaws/navigation-index.xsl"/>
+  -->
+  <xsl:import href="navigation-index.xsl"/>
   
   <xsl:template name="pageContent">
     <a class="intLink" name="top" />

ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-index.xsl

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet
+<xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
-	xmlns:forum="http://www.arsdigita.com/forum/1.0"
 				xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
 				xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
 				xmlns:nav="http://ccm.redhat.com/london/navigation" 

ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/forum-index.css

@@ -1,6 +1,7 @@
 @import url("css/main.css");
-<--@import url("/css/acs-master.css");-->
+/* Chris presumably forgot the ! to comment the following 2 lines out
-<--@import url("/css/tabbed-pane/tabbed-pane.css");-->	
+/* <--@import url("/css/acs-master.css");-->   */
+/* <--@import url("/css/tabbed-pane/tabbed-pane.css");-->  */
 
 
 body {

ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/forum-index.xsl

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet
+<xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
-	xmlns:forum="http://www.arsdigita.com/forum/1.0"
 				xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
 				xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
 				xmlns:nav="http://ccm.redhat.com/london/navigation" 
@@ -45,7 +44,6 @@
 	<xsl:template match="bebop:page[@class='simplePage']">
 		<html lang="en">
 			<head>
-
 				<title>
 					Forum
 				</title>
@@ -56,11 +54,6 @@
 			</head>
 
 			<body>
-
-
-
-
-
  				<a name="Ptop"></a>
 				<a class="navHide" href="#startcontent" title="Go directly to main content" accesskey="S">Skip over navigation</a>
 				<span class="hide">|</span>

ccm-ldn-aplaws/web/themes/static/aplaws/forum-index.css

@@ -0,0 +1,403 @@
+@import url("css/main.css");
+/* Chris presumably forgot the ! to comment the following 2 lines out
+/* <--@import url("/css/acs-master.css");-->   */
+/* <--@import url("/css/tabbed-pane/tabbed-pane.css");-->  */
+
+
+body {
+	margin: 0;
+	background-color: #FFF;
+	color: #000;
+	font-family: Verdana, Arial, Helvetica, sans-serif; 
+}
+
+.forum {
+	font-size: 0.8em;
+	margin: 8px 0 10px 2px;	
+}
+
+.content {
+	margin-left: 10px;
+}
+
+
+/*form submission*/
+
+.forumSelect {
+	margin-top: 0.2em;
+	float:left;
+}
+.forumButton input {
+	float:left;
+	margin-top: 0.2em;
+	margin-right: 5px;
+	padding-left: 2px;
+	padding-right: 2px;
+	color: #000;
+	background-color: #CCC;
+	vertical-align: middle;
+	border: 1px solid #000;
+	
+}
+
+.submit {
+	clear: both;
+	margin-left: 100px;	
+}
+
+/*
+view all threads
+
+*/
+
+#selectLabel {
+	float:left;
+	color: white;
+	padding-top: 0.2em;
+	padding-left: 0.2em;
+}
+#selectCategory {
+	background-color: #999;
+	height: 2.2em;
+	
+}
+
+#threadHead {
+	background-color: #E5F3FC;
+	font-weight: bold;
+	height: 1.5em;	
+	padding-left: 0.2em;
+	margin-bottom: 0.3em;
+	
+}
+#noMessages {
+	clear:both;
+	float:left;
+	width: 100%;
+	
+}
+.subject {
+	clear: both;
+	float:left;
+	width: 190px;
+	padding: 4px 0 4px 22px;
+	background-position: 4px 0.7em;
+	background-repeat: no-repeat;
+	background-image: url("images/forum/read.gif");
+}
+
+.topic {
+	clear:both;
+	float:left;
+	width: 212px;
+	padding: 4px 0 4px 0px;
+}
+
+.threadSubject {
+	clear:both;
+	float:left;
+	width: 140px;
+	padding: 4px 0 4px 0px;
+}
+
+.author {
+	float:left;
+	width: 100px;
+	padding: 4px 0 4px 0px;
+	text-align: center;
+}
+
+.replies {
+	float:left;
+	text-align: center;
+	width: 60px;
+	padding: 4px 0 4px 0px;
+}
+
+.threads {
+	float:left;
+	text-align: center;
+	width: 75px;
+	padding: 4px 0 4px 0px;
+}
+
+.status {
+	float:left;
+	width: 75px;
+	padding: 4px 0 4px 0px;
+}
+
+.delete {
+	float:left;
+	text-align: center;
+	width: 50px;
+	padding: 4px 0 4px 0px;
+}
+
+.lastPost {
+	float: left;
+	text-align: center;
+	width: 150px;
+	padding: 4px 0 4px 0px;
+}
+
+#newTopicLink a {	
+	padding: 4px 0 4px 22px;
+	background-position: 0px 0.3em;
+	background-repeat: no-repeat;
+	background-image: url("images/forum/post-16x16.gif");	
+}
+
+#viewAllTopicsLink a {
+	float: left;
+	padding: 4px 15px 4px 22px;
+	background-position: 0px 0.3em;
+	background-repeat: no-repeat;
+	background-image: url("images/forum/back-to-16x16.gif");
+	
+}
+
+#watchTopicLink a {
+	float: left;
+	padding: 4px 0 4px 22px;
+	background-position: 0px 0.3em;
+	background-repeat: no-repeat;
+	background-image: url("images/forum/watch-16x16.gif");
+	margin-left: 0.8em;
+	margin-bottom: 0.8em;
+}
+
+#info {
+	clear:both;
+	padding: 4px 0 4px 22px;
+	background-position: 0px 0.6em;
+	background-repeat: no-repeat;
+	background-image: url("images/forum/info-16x16.gif");
+	color: green;
+	margin-left: 0.8em;
+}
+
+.post {
+	clear: both;
+	margin-bottom: 0.8em;
+	font-size: 1em;
+}
+
+.postOdd {
+	background-color: #EFEFEF;
+
+}
+
+.postEven {
+	background-color: #FFFFFF;
+}
+
+#topic {
+	margin-bottom: 0.8em;
+	font-weight: bold;
+}
+
+.actions {
+	float: right;
+	margin-right: 0.3em;	
+}
+
+.header {	
+	float: left;	
+	margin-left: 0.3em;	
+	font-weight: bold;
+}
+
+.message {
+	clear: both;
+	float: left;
+	width:98%;
+    margin-left: 0.3em;
+	margin-bottom: 0.5em;
+}
+
+.postDetails {
+	clear: both;
+	float: left;
+	margin-bottom: 0.5em;
+	margin-left: 0.3em;
+}
+
+.bar {
+	clear:both;
+	float:left;
+	width: 98%;
+	padding-left: 0.3em;
+	padding-right: 0.3em;
+	padding-top: 0.5em;
+	padding-bottom: 0.5em;
+}
+
+.replyBar {
+	clear:both;	
+	padding-right: 0.3em;
+	padding-top: 0.5em;
+	padding-bottom: 0.5em;
+}
+
+
+.clearGroup {
+	clear:both;
+	margin-bottom: 0.5em;
+}
+
+.columnOne {
+	float: left;
+	width: 100px;
+	font-size: 1em;
+}
+
+.columnOneWide {
+	float: left;
+	width: 130px;
+	font-size: 1em;
+}
+
+.columnTwo {		
+	display: inline;
+	font-size: 1em;
+	margin: 0;		
+}
+
+
+.columnTwo input {
+	width: 300px;	
+}
+
+.columnTwo select {	
+	width: 300px;	
+}
+
+
+.columnTwo textArea {
+	width: 300px;	
+}
+
+.columnThree {
+	font-size: 1em;
+}
+
+#title {
+	float:left;
+	width: 100%;		
+		
+	font-size: 1.2em;
+}
+
+
+fieldset {
+	padding: 0.3em 0.3em 0.3em 0.3em;	
+}
+
+.fileLink {
+	margin-left: 0.5em;
+	clear: both;
+	float:left;
+}
+
+
+textarea {
+	width: 450px;
+}
+
+.validationError {
+	color: red;
+	margin-left: 100px;
+}
+
+#images {
+	clear: both;
+	float:left;
+	margin-left: 0.3em;	
+}
+
+#plainText {
+	clear: both;
+	font-size: 1em;
+	margin-bottom: 0.5em;
+}
+
+li {
+	list-style-position: inside;	
+}
+	
+.expiry input {
+	width: 50px;
+}
+
+.fileTable {
+	width: 100%;	
+}
+
+
+pre {
+
+	font-size: 1em;
+}
+
+
+/* Contents of tabbed-pane.css - forum tabs */
+
+div.tabbed-pane div, div.tabbed-pane table.tab-set, div.tabbed-pane table.tab-set td {
+  margin: 0;
+  border: 0;
+  padding: 0;
+}
+
+div.tabbed-pane table {
+  border-collapse: collapse;
+}
+
+div.tabbed-pane table.tab-set {
+  margin-left: 10px;
+}
+
+div.tabbed-pane table.tab-set a {
+  text-decoration: none;
+  color: rgb(63,63,63);
+}
+
+div.tabbed-pane table.tab-set td.tab-label {
+  margin-left: 4px;
+  padding: 5px 0 3px 10px;
+ 
+  background: rgb(225,225,225) url(/css/tabbed-pane/tab-unselected.png) no-repeat;
+}
+
+div.tabbed-pane table.tab-set td.tab-end {
+  width: 10px;
+  background: url(/css/tabbed-pane/tab-unselected-end.png) no-repeat;
+}
+
+div.tabbed-pane table.tab-set td.current-tab-label {
+  margin-left: 4px;
+  padding: 5px 0 3px 10px;
+  background: rgb(162,30,30) url(/css/tabbed-pane/tab-selected.png) no-repeat;
+  color: white;
+}
+
+div.tabbed-pane table.tab-set td.current-tab-end {
+  width: 10px;
+  background: url(/css/tabbed-pane/tab-selected-end.png) no-repeat;
+}
+
+div.tabbed-pane table.tab-set td.tab-spacer {
+  width: 4px;
+}
+
+div.tabbed-pane table.rule {
+  margin-left: 10px; 
+  width: 100%;
+  background: rgb(162,30,30) url(/css/tabbed-pane/tab-bar.png) repeat-x;
+  height: 10px;
+}
+
+div.tabbed-pane div.current-pane {
+  width: 100%;
+}
+