Weitere Anpassungen ccm-sci-bundle, insbesondere an Umbenennung ccm-navigation.

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

ccm-sci-bundle/application.xml

@@ -9,12 +9,12 @@
     <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-navigation" 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-sci-bundle/bundles/demo/cfg/integration.properties

@@ -93,12 +93,11 @@ com.arsdigita.forum.allow_quick_finish=true
 com.arsdigita.forum.disable_page_caching=true
 
 
-# ccm-ldn-navigation application
+# ccm-navigation application
-com.arsdigita.london.navigation.category_menu_show_grand_children=false
+com.arsdigita.navigation.category_menu_show_grand_children=false
-com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_cat_root_path=/navigation/
-# com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp
+com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/sci-default.jsp
-com.arsdigita.london.navigation.default_template=/templates/ccm-ldn-navigation/navigation/sci-default.jsp
+com.arsdigita.navigation.templates_file=WEB-INF/navigation/sci-templates.txt
-com.arsdigita.london.navigation.templates_file=WEB-INF/navigation/sci-templates.txt
 
 
 # ccm-ldn-search application

ccm-sci-bundle/bundles/demo/cfg/project.xml

@@ -35,11 +35,11 @@
         <ccm:application name="ccm-cms-types-formsectionitem"/>
 
 <!--   Applications   -->
+        <ccm:application name="ccm-navigation"/>
         <ccm:application name="ccm-portalworkspace"/>
         <ccm:application name="ccm-themedirector"/>
 
 <!--   LDN extension  -->
-        <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>                    

ccm-sci-bundle/bundles/demo/cfg/web.xml-sci

@@ -208,11 +208,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -345,7 +345,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->

ccm-sci-bundle/bundles/demo/res/bundle/navigation/sci-templates.txt

@@ -1,9 +1,9 @@
-ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-ldn-navigation/navigation/sci-default.jsp
+ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/sci-default.jsp
-ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-ldn-navigation/navigation/sci-recent.jsp
+ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/sci-recent.jsp
-ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-ldn-navigation/navigation/sci-atoz.jsp
+ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/sci-atoz.jsp
-ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-ldn-navigation/navigation/sci-events.jsp
+ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/sci-events.jsp
-ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-ldn-navigation/navigation/sci-portal.jsp
+ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/sci-portal.jsp
-ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-ldn-navigation/navigation/sci-portal-welcome.jsp
+ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/sci-portal-welcome.jsp
-ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-ldn-navigation/navigation/sci-welcome.jsp
+ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/sci-welcome.jsp
-ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-ldn-navigation/navigation/SpecializingList.jsp
+ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/SpecializingList.jsp
-ScientificCMS Publications List,Sci publications listing page,/templates/ccm-ldn-navigation/navigation/SciPublicationList.jsp
+ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/SciPublicationList.jsp

ccm-sci-bundle/bundles/demo/templates/placeholder.info

@@ -9,4 +9,4 @@ to the default template files. In the later case a developer must
 provide a customised template.txt file replacing the default file
    /src/WEB-INF/navigation/sci-templates.txt
 This file must be specified in parameter 
-   com.arsdigita.london.navigation.templates_file
+   com.arsdigita.navigation.templates_file

ccm-sci-bundle/bundles/devel/cfg/integration.properties

@@ -93,12 +93,11 @@ com.arsdigita.forum.allow_quick_finish=true
 com.arsdigita.forum.disable_page_caching=true
 
 
-# ccm-ldn-navigation application
+# ccm-navigation application
-com.arsdigita.london.navigation.category_menu_show_grand_children=false
+com.arsdigita.navigation.category_menu_show_grand_children=false
-com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_cat_root_path=/navigation/
-# com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp
+com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/sci-default.jsp
-com.arsdigita.london.navigation.default_template=/templates/ccm-ldn-navigation/navigation/sci-default.jsp
+com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
-com.arsdigita.london.navigation.templates_file=bundle/navigation/sci-templates.txt
 
 
 # ccm-ldn-search application
@@ -117,7 +116,7 @@ themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 
 # ccm-sci-bundle (Loader only)
-# com.arsdigita.bundle.category_files=WEB-INF/sci/sci-nav-domain-1.00.xml,WEB-INF/sci/sci-nav-hierarchy-1.00.xml
+# com.arsdigita.bundle.category_files=bundle/categories/sci-nav-domain-1.00.xml,WEB-INF/sci/sci-nav-hierarchy-1.00.xml
 
 # =============================================================================================
 # runtime specific configurations

ccm-sci-bundle/bundles/devel/cfg/project.xml

@@ -35,11 +35,11 @@
         <ccm:application name="ccm-cms-types-formsectionitem"/>
 
 <!--   Applications   -->
+        <ccm:application name="ccm-navigation"/>
         <ccm:application name="ccm-portalworkspace"/>
         <ccm:application name="ccm-themedirector"/>
 
 <!--   LDN extension  -->
-        <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>                    

ccm-sci-bundle/bundles/devel/cfg/web.xml-sci

@@ -208,11 +208,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -345,7 +345,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->

ccm-sci-bundle/bundles/devel/templates/placeholder.info

@@ -9,4 +9,4 @@ to the default template files. In the later case a developer must
 provide a customised template.txt file replacing the default file
    /src/WEB-INF/navigation/sci-templates.txt
 This file must be specified in parameter 
-   com.arsdigita.london.navigation.templates_file
+   com.arsdigita.navigation.templates_file

ccm-sci-bundle/bundles/local/aap/cfg/integration.properties

@@ -93,10 +93,10 @@ com.arsdigita.forum.allow_quick_finish=true
 com.arsdigita.forum.disable_page_caching=true
 
 
-# ccm-ldn-navigation application
+# ccm-navigation application
-com.arsdigita.london.navigation.category_menu_show_grand_children=false
+com.arsdigita.navigation.category_menu_show_grand_children=false
-com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_cat_root_path=/navigation/
-com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp
+com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/sci-default.jsp
 
 
 # ccm-ldn-search application
@@ -109,7 +109,7 @@ com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.
 
 # ccm-ldn-themedirector application
 themedirector.default_theme_context=
-themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
+#themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
 themedirector.default_theme_path=themes/static/aplaws-generic
 themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 

ccm-sci-bundle/bundles/local/aap/cfg/project.xml

@@ -35,11 +35,11 @@
         <ccm:application name="ccm-cms-types-formsectionitem"/>
 
 <!--   Applications   -->
+        <ccm:application name="ccm-navigation"/>
         <ccm:application name="ccm-portalworkspace"/>
         <ccm:application name="ccm-themedirector"/>
 
 <!--   LDN extension  -->
-        <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>                    

ccm-sci-bundle/bundles/local/aap/cfg/web.xml-sci

@@ -208,11 +208,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -345,7 +345,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->

ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties

@@ -93,10 +93,10 @@ com.arsdigita.forum.allow_quick_finish=true
 com.arsdigita.forum.disable_page_caching=true
 
 
-# ccm-ldn-navigation application
+# ccm-navigation application
-com.arsdigita.london.navigation.category_menu_show_grand_children=false
+com.arsdigita.navigation.category_menu_show_grand_children=false
-com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_cat_root_path=/navigation/
-com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp
+com.arsdigita.navigation.default_template=templates/ccm-navigation/navigation/sci-default.jsp
 
 
 # ccm-ldn-search application
@@ -107,9 +107,9 @@ com.arsdigita.london.search.show_sponsored_links=true
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
-# ccm-ldn-themedirector application
+# ccm-themedirector application
 themedirector.default_theme_context=
-themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
+#themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
 themedirector.default_theme_path=themes/static/aplaws-generic
 themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 

ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml

@@ -35,11 +35,11 @@
         <ccm:application name="ccm-cms-types-formsectionitem"/>
 
 <!--   Applications   -->
+        <ccm:application name="ccm-navigation"/>
         <ccm:application name="ccm-portalworkspace"/>
         <ccm:application name="ccm-themedirector"/>
 
 <!--   LDN extension  -->
-        <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>                    

ccm-sci-bundle/bundles/local/iaw-dev/cfg/web.xml-sci

@@ -208,11 +208,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -345,7 +345,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->

ccm-sci-bundle/bundles/local/iaw-std/cfg/integration.properties

@@ -93,10 +93,10 @@ com.arsdigita.forum.allow_quick_finish=true
 com.arsdigita.forum.disable_page_caching=true
 
 
-# ccm-ldn-navigation application
+# ccm-navigation application
-com.arsdigita.london.navigation.category_menu_show_grand_children=false
+com.arsdigita.navigation.category_menu_show_grand_children=false
-com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_cat_root_path=/navigation/
-com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp
+com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/zes-default.jsp
 
 
 # ccm-ldn-search application

ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml

@@ -35,11 +35,11 @@
         <ccm:application name="ccm-cms-types-formsectionitem"/>
 
 <!--   Applications   -->
+        <ccm:application name="ccm-navigation"/>
         <ccm:application name="ccm-portalworkspace"/>
         <ccm:application name="ccm-themedirector"/>
 
 <!--   LDN extension  -->
-        <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>                    

ccm-sci-bundle/bundles/local/iaw-std/cfg/web.xml-sci

@@ -208,11 +208,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -345,7 +345,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->

ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-navigation/navigation/iaw-archive.jsp

@@ -12,9 +12,9 @@
 
   <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.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
 
   <jsp:scriptlet>
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
@@ -29,20 +29,20 @@
     title="Navigation" cache="true">
 
     <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+      classname="com.arsdigita.navigation.ui.GreetingItem"/>
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
 
     <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
+      classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event");
 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setSQLFilter("(endDate &lt;= :today) or (endDate is null and startDate &lt;= :today)");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setSQLFilter("(endDate &lt;= :today) or (endDate is null and startDate &lt;= :today)");
 
       // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings
       // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren.
@@ -60,23 +60,23 @@
                                                               now.get(java.util.GregorianCalendar.MINUTE),
                                                               now.get(java.util.GregorianCalendar.SECOND))).getTime();
 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setParameter("today", today);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setParameter("today", today);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setParameter("time", time);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setParameter("time", time);
 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setDescendCategories(true);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setDescendCategories(true);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("startDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("startDate");
 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("lead");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("lead");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("eventDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("eventDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("launchDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("launchDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("startDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("startDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("endDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("endDate");
     </jsp:scriptlet>
     <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+         classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
   </define:page>
   <show:all/>

ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-navigation/navigation/iaw-events.jsp

@@ -12,9 +12,9 @@
 
   <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.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
 
   <jsp:scriptlet>
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
@@ -29,20 +29,20 @@
     title="Navigation" cache="true">
 
     <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+      classname="com.arsdigita.navigation.ui.GreetingItem"/>
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
 
     <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
+      classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event");
 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setSQLFilter("(endDate &gt;= :today and (endTime &gt; :time or endTime is null)) or (endDate is null and startDate &gt;= :today)");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setSQLFilter("(endDate &gt;= :today and (endTime &gt; :time or endTime is null)) or (endDate is null and startDate &gt;= :today)");
 
       // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings
       // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren.
@@ -60,23 +60,23 @@
                                                               now.get(java.util.GregorianCalendar.MINUTE),
                                                               now.get(java.util.GregorianCalendar.SECOND))).getTime();
 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setParameter("today", today);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setParameter("today", today);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setParameter("time", time);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setParameter("time", time);
 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setDescendCategories(true);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setDescendCategories(true);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("startDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("startDate");
 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("lead");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("lead");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("eventDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("eventDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("launchDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("launchDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("startDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("startDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("endDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("endDate");
     </jsp:scriptlet>
     <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+         classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
   </define:page>
   <show:all/>

ccm-sci-bundle/bundles/local/iaw-std/templates/placeholder.info

@@ -9,4 +9,4 @@ to the default template files. In the later case a developer must
 provide a customised template.txt file replacing the default file
    /src/WEB-INF/navigation/sci-templates.txt
 This file must be specified in parameter 
-   com.arsdigita.london.navigation.templates_file
+   com.arsdigita.navigation.templates_file

ccm-sci-bundle/bundles/local/zes-dev/cfg/integration.properties

@@ -21,10 +21,6 @@ waf.kernel.supported_languages=de,en
 ; security.properties: 
 waf.auto_registration_on=false
 
-# MOVED to ui.Config
-#waf.pagemap.root=navigation/
-#waf.pagemap.workspace=navigation/
-#waf.pagemap.login_redirect=content/content-center-redirect.jsp
 
 ; Searches for localized style sheet (among others) 
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
@@ -104,10 +100,10 @@ com.arsdigita.forum.allow_quick_finish=true
 com.arsdigita.forum.disable_page_caching=true
 
 
-# ccm-ldn-navigation application
+# ccm-navigation application
-com.arsdigita.london.navigation.category_menu_show_grand_children=false
+com.arsdigita.navigation.category_menu_show_grand_children=false
-com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_cat_root_path=/navigation/
-com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp
+com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/zes-default.jsp
 
 
 

ccm-sci-bundle/bundles/local/zes-dev/cfg/project.xml

@@ -64,6 +64,9 @@
         <ccm:application name="ccm-docmngr"/>                        -->
 <!--    <ccm:application name="ccm-formbuilder-pdf"/>                -->
 <!--    <ccm:application name="ccm-forum"/>                          -->
+        <ccm:application name="ccm-navigation"/>
+        <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-themedirector"/>
 <!--    <ccm:application name="ccm-simplesurvey"/>                   -->
         <ccm:application name="ccm-user-preferences"/>
 <!--    <ccm:application name="ccm-weblog"/>                         -->
@@ -77,14 +80,11 @@
 <!--    <ccm:application name="ccm-ldn-exporter"/>                   -->
 <!--    <ccm:application name="ccm-ldn-freeform"/>                   -->
 <!--    <ccm:application name="ccm-ldn-importer"/>                   -->
-        <ccm:application name="ccm-ldn-navigation"/>
-        <ccm:application name="ccm-ldn-portal"/>
         <ccm:application name="ccm-ldn-rss"/>                        
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>                    
         <ccm:application name="ccm-ldn-terms"/>
-        <ccm:application name="ccm-ldn-theme"/>
         <ccm:application name="ccm-ldn-util"/>
 
 

ccm-sci-bundle/bundles/local/zes-dev/cfg/web.xml

@@ -219,11 +219,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -363,7 +363,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->

ccm-sci-bundle/bundles/local/zes-std/cfg/integration.properties

@@ -21,10 +21,6 @@ waf.kernel.supported_languages=de,en
 ; security.properties: 
 waf.auto_registration_on=false
 
-# MOVED to ui.Config
-#waf.pagemap.root=navigation/
-#waf.pagemap.workspace=navigation/
-#waf.pagemap.login_redirect=content/content-center-redirect.jsp
 
 ; Searches for localized style sheet (among others) 
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
@@ -105,10 +101,10 @@ com.arsdigita.forum.allow_quick_finish=true
 com.arsdigita.forum.disable_page_caching=true
 
 
-# ccm-ldn-navigation application
+# ccm-navigation application
-com.arsdigita.london.navigation.category_menu_show_grand_children=false
+com.arsdigita.navigation.category_menu_show_grand_children=false
-com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_cat_root_path=/navigation/
-com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp
+com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/zes-default.jsp
 
 
 

ccm-sci-bundle/bundles/local/zes-std/cfg/project.xml

@@ -46,6 +46,7 @@
 <!--  Applications   -->
 <!--  - - - - -  -   -->
         <ccm:application name="ccm-forum"/>                
+        <ccm:application name="ccm-navigation"/>
         <ccm:application name="ccm-portalworkspace"/>                
         <ccm:application name="ccm-simplesurvey"/>                
         <ccm:application name="ccm-themedirector"/>                
@@ -53,7 +54,6 @@
 
 <!--  LDN extension  -->
 <!--  - - - - - - -  -->
-        <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-rss"/>                        
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>

ccm-sci-bundle/bundles/local/zes-std/cfg/web.xml

@@ -219,11 +219,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -363,7 +363,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->

ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartment-index.jsp

@@ -1,67 +0,0 @@
-<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="false">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="sectionXML"
-      classname="com.arsdigita.cms.contenttypes.ui.SciDepartmentWithPublicationsPanel"/>
-    <jsp:scriptlet>
-        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
-        ((com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel) 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.cms.contenttypes.ui.SciDepartmentPanel)sectionXML).setPageSize(30);
-
-      ((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-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentActiveMembers.jsp

@@ -1,56 +0,0 @@
-<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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
-    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");        
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember != true");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>

ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartment-index.jsp

@@ -0,0 +1,67 @@
+<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.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.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="false">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.navigation.ui.GreetingItem"/>
+    <define:component name="sectionXML"
+      classname="com.arsdigita.cms.contenttypes.ui.SciDepartmentWithPublicationsPanel"/>
+    <jsp:scriptlet>
+        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
+        ((com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel) sectionXML).setContentItem(item);
+    </jsp:scriptlet>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel)sectionXML).setPageSize(30);
+
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
+    </jsp:scriptlet>
+
+    <define:component name="assignedTerms"
+         classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
+
+  </define:page>
+  <show:all/>
+</jsp:root>
+

ccm-sci-bundle/bundles/local/zes-std/templates/ccm-navigation/navigation/SciDepartmentActiveMembers.jsp

@@ -0,0 +1,56 @@
+<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.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <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.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");        
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember != true");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>

ccm-sci-bundle/bundles/local/zes-std/templates/placeholder.info

@@ -9,4 +9,4 @@ to the default template files. In the later case a developer must
 provide a customised template.txt file replacing the default file
    /src/WEB-INF/navigation/sci-templates.txt
 This file must be specified in parameter 
-   com.arsdigita.london.navigation.templates_file
+   com.arsdigita.navigation.templates_file

ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java

@@ -18,7 +18,6 @@
 
 package com.arsdigita.bundle;
 
-// import com.arsdigita.london.navigation.Template;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.london.terms.importer.Parser;
 
@@ -35,7 +34,6 @@ import com.arsdigita.persistence.DataQuery;
 import com.arsdigita.runtime.ScriptContext;
 import com.arsdigita.util.parameter.Parameter;
 import com.arsdigita.util.parameter.StringArrayParameter;
-// import com.arsdigita.util.parameter.StringParameter;
 import com.arsdigita.web.Application;
 
 import org.apache.log4j.Logger;

ccm-sci-bundle/src/com/arsdigita/bundle/ui/CategoryPortalSelectionModel.java

@@ -18,8 +18,8 @@
 
 package com.arsdigita.bundle.ui;
 
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
-import com.arsdigita.london.navigation.NavigationModel;
+import com.arsdigita.navigation.NavigationModel;
 
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.persistence.DataCollection;

ccm-sci-bundle/web/WEB-INF/web.xml-sci

@@ -208,11 +208,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -345,7 +345,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->

ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/SpecializingList.jsp

@@ -1,46 +0,0 @@
-<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-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-atoz.jsp

@@ -1,51 +0,0 @@
-<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="atozItemPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <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.AtoZObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
-
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);      
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().addOrder("title");
-      
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(20);
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "definition");
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "summary");
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "lead");
-    </jsp:scriptlet>
-  </define:page>
-
-  <show:all/>
-</jsp:root>

ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-default.jsp

@@ -1,59 +0,0 @@
-<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="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-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-recent.jsp

@@ -1,56 +0,0 @@
-<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="recentItemPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <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.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("id");
-      
-      ((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( "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:page>
-
-  <show:all/>
-</jsp:root>

ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-welcome.jsp

@@ -1,121 +0,0 @@
-<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 template for the ZeS welcome / start page using navigation -->
-
-  <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="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("eventDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("launchDate");
-      ((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="eventList"
-      classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event");
-
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setSQLFilter("(endDate &gt;= :today and (endTime &gt; :time or endTime is null)) or (endDate is null and startDate &gt;= :today)");
-
-      // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings          // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren.                    // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.                        // Komplizierter geht's wohl nicht mehr.                                                                                                             
-      java.util.GregorianCalendar now = new java.util.GregorianCalendar();
-      java.util.Date today = (new java.util.GregorianCalendar(now.get(java.util.GregorianCalendar.YEAR),
-                                                              now.get(java.util.GregorianCalendar.MONTH), 
-                                                              now.get(java.util.GregorianCalendar.DATE))).getTime();
-      // Im Event-CT ist das Datum als SQL-Type Date eingetragen, die Uhrzeit aber als SQL-Typ timestamptz. Leider wird von ccm im letzten
-      // das Datum nicht gesetzt, so daß der Timestamp immer eine Uhrzeit am 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier
-      // diesen kompliezierten Vergleich notwendig. Sonst könnte man einfach mit dem aktuellen Timestamp vergleichen.
-      java.util.Date time  = (new java.util.GregorianCalendar(70,0,1, // this is 01.01.1970 - start of UNIX timestamp
-                                                              now.get(java.util.GregorianCalendar.HOUR_OF_DAY),
-                                                              now.get(java.util.GregorianCalendar.MINUTE),
-                                                              now.get(java.util.GregorianCalendar.SECOND))).getTime();
- 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setParameter("today", today);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setParameter("time", time);
-
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setDescendCategories(true);      
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().addOrder("startDate");
-      
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().setPageSize(5);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("lead");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("eventDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("launchDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("startDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("endDate");
-    </jsp:scriptlet>
-    <define:component name="newsList"
-      classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.NewsItem");
-
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setSQLFilter("newsDate &gt; :oldNewsDate");
-      
-      // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings
-      // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren. 
-      // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.
-      // Komplizierter geht's wohl nicht mehr.
-      java.util.GregorianCalendar oldDate = new java.util.GregorianCalendar();
-      oldDate.add(java.util.Calendar.MONTH, -2);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).setParameter("oldNewsDate", oldDate.getTime());
-
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getDefinition().setDescendCategories(true);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getDefinition().addOrder("newsDate desc");
-
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().setPageSize(5);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("lead");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("newsDate");
-    </jsp:scriptlet>
-
-    <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-  </define:page>
-  <show:all/>
-</jsp:root>

ccm-sci-bundle/web/templates/ccm-navigation/navigation/SciPublicationList.jsp

@@ -6,10 +6,10 @@
  
     <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.navigation.Navigation"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.ui.object.CustomizableObjectList"/>
+    <jsp:directive.page import="com.arsdigita.navigation.ui.object.CustomizableObjectList"/>
 
     <jsp:scriptlet>
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
@@ -23,13 +23,13 @@
     <define:page name="defaultItemPage" application="navigation"
                  title="Navigation" cache="false">
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.GreetingItem"/>
         <define:component name="categoryPath"
-                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+                          classname="com.arsdigita.navigation.ui.category.Path"/>
         <define:component name="categoryMenu"
-                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+                          classname="com.arsdigita.navigation.ui.category.Menu"/>
         <define:component name="itemList"
-                          classname="com.arsdigita.london.navigation.ui.object.CustomizableObjectList"/>
+                          classname="com.arsdigita.navigation.ui.object.CustomizableObjectList"/>
 
       <jsp:scriptlet>
       CustomizableObjectList objList = (CustomizableObjectList) itemList;
@@ -53,7 +53,7 @@
       </jsp:scriptlet>
 
       <define:component name="assignedTerms"	
-                        classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                        classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 		 
     </define:page> 
     <show:all/>

ccm-sci-bundle/web/templates/ccm-navigation/navigation/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.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.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.navigation.ui.GreetingItem"/>
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.navigation.ui.category.Path"/>
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.navigation.ui.category.Menu"/>
+        <define:component name="itemList"
+                          classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20);
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true);
+        </jsp:scriptlet>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
+    </define:page>
+    <show:all/>	
+</jsp:root>

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-atoz.jsp

@@ -0,0 +1,51 @@
+<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.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.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="atozItemPage" application="navigation"
+    title="Navigation" cache="true">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.navigation.ui.GreetingItem"/>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.navigation.ui.object.AtoZObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().addOrder("title");
+      
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(20);
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "definition");
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "summary");
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "lead");
+    </jsp:scriptlet>
+  </define:page>
+
+  <show:all/>
+</jsp:root>

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-default.jsp

@@ -0,0 +1,59 @@
+<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.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.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.navigation.ui.GreetingItem"/>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
+    </jsp:scriptlet>
+
+    <define:component name="assignedTerms"
+         classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
+
+  </define:page>
+  <show:all/>
+</jsp:root>

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-events.jsp

@@ -6,9 +6,9 @@
 
   <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.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
 
   <jsp:scriptlet>
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
@@ -23,19 +23,19 @@
     title="Navigation" cache="true">
 
     <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+      classname="com.arsdigita.navigation.ui.GreetingItem"/>
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
     <define:component name="eventList"
-      classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
+      classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event");
 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setSQLFilter("(endDate &gt;= :today and (endTime &gt; :time or endTime is null)) or (endDate is null and startDate &gt;= :today)");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setSQLFilter("(endDate &gt;= :today and (endTime &gt; :time or endTime is null)) or (endDate is null and startDate &gt;= :today)");
 
       // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings          // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren.                    // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.                        // Komplizierter geht's wohl nicht mehr.
       java.util.GregorianCalendar now = new java.util.GregorianCalendar();
@@ -50,23 +50,23 @@
                                                               now.get(java.util.GregorianCalendar.MINUTE),
                                                               now.get(java.util.GregorianCalendar.SECOND))).getTime();
 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setParameter("today", today);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setParameter("today", today);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).setParameter("time", time);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setParameter("time", time);
 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setDescendCategories(true);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setDescendCategories(true);
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getDefinition().addOrder("startDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().addOrder("startDate");
 
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("title");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("lead");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("lead");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("eventDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("eventDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("launchDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("launchDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("startDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("startDate");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("endDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("endDate");
 </jsp:scriptlet>
 
     <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+         classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
   </define:page>
   <show:all/>

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

@@ -7,7 +7,7 @@
   <%-- JSP template to use a portal page as index page in navigation  --%>
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
   <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
   <jsp:directive.page import="com.arsdigita.aplaws.ui.CategoryPortalSelectionModel"/>
 
@@ -24,13 +24,13 @@
     title="Navigation" cache="true">
 
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
     <define:component name="portalWorkspace"
-      classname="com.arsdigita.london.portal.ui.WorkspaceViewer"/>
+      classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.portal.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
+      ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
     </jsp:scriptlet>
   </define:page>
 

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp

@@ -7,7 +7,7 @@
   <%-- JSP template to use a portal page as index page in navigation  --%>
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
   <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
   <jsp:directive.page import="com.arsdigita.aplaws.ui.CategoryPortalSelectionModel"/>
 
@@ -24,13 +24,13 @@
     title="Navigation" cache="true">
 
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
     <define:component name="portalWorkspace"
-      classname="com.arsdigita.london.portal.ui.WorkspaceViewer"/>
+      classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.portal.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
+      ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
     </jsp:scriptlet>
   </define:page>
 

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-recent.jsp

@@ -0,0 +1,56 @@
+<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.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.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="recentItemPage" application="navigation"
+    title="Navigation" cache="true">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.navigation.ui.GreetingItem"/>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("id");
+      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
+
+    </jsp:scriptlet>
+  </define:page>
+
+  <show:all/>
+</jsp:root>

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-welcome.jsp

@@ -0,0 +1,121 @@
+<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 template for the ZeS welcome / start page using navigation -->
+
+  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+  <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.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.navigation.ui.GreetingItem"/>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("eventDate");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("launchDate");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("startDate");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("endDate");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("newsDate");
+    </jsp:scriptlet>
+    <define:component name="eventList"
+      classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event");
+
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setSQLFilter("(endDate &gt;= :today and (endTime &gt; :time or endTime is null)) or (endDate is null and startDate &gt;= :today)");
+
+      // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings          // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren.                    // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.                        // Komplizierter geht's wohl nicht mehr.                                                                                                             
+      java.util.GregorianCalendar now = new java.util.GregorianCalendar();
+      java.util.Date today = (new java.util.GregorianCalendar(now.get(java.util.GregorianCalendar.YEAR),
+                                                              now.get(java.util.GregorianCalendar.MONTH), 
+                                                              now.get(java.util.GregorianCalendar.DATE))).getTime();
+      // Im Event-CT ist das Datum als SQL-Type Date eingetragen, die Uhrzeit aber als SQL-Typ timestamptz. Leider wird von ccm im letzten
+      // das Datum nicht gesetzt, so daß der Timestamp immer eine Uhrzeit am 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier
+      // diesen kompliezierten Vergleich notwendig. Sonst könnte man einfach mit dem aktuellen Timestamp vergleichen.
+      java.util.Date time  = (new java.util.GregorianCalendar(70,0,1, // this is 01.01.1970 - start of UNIX timestamp
+                                                              now.get(java.util.GregorianCalendar.HOUR_OF_DAY),
+                                                              now.get(java.util.GregorianCalendar.MINUTE),
+                                                              now.get(java.util.GregorianCalendar.SECOND))).getTime();
+ 
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setParameter("today", today);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setParameter("time", time);
+
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setDescendCategories(true);      
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().addOrder("startDate");
+      
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().setPageSize(5);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("title");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("lead");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("eventDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("launchDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("startDate");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("endDate");
+    </jsp:scriptlet>
+    <define:component name="newsList"
+      classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.NewsItem");
+
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).setSQLFilter("newsDate &gt; :oldNewsDate");
+      
+      // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings
+      // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren. 
+      // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.
+      // Komplizierter geht's wohl nicht mehr.
+      java.util.GregorianCalendar oldDate = new java.util.GregorianCalendar();
+      oldDate.add(java.util.Calendar.MONTH, -2);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).setParameter("oldNewsDate", oldDate.getTime());
+
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getDefinition().setDescendCategories(true);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getDefinition().addOrder("newsDate desc");
+
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getRenderer().setPageSize(5);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("title");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("lead");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).getRenderer().addAttribute("newsDate");
+    </jsp:scriptlet>
+
+    <define:component name="assignedTerms"
+         classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
+
+  </define:page>
+  <show:all/>
+</jsp:root>

ccm-sci-bundle/web/templates/ccm-navigation/navigation/sitemap.jsp

@@ -19,13 +19,13 @@
     </jsp:scriptlet>
 
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
     <define:component name="categoryNav"
-                      classname="com.arsdigita.london.navigation.ui.category.Hierarchy">
+                      classname="com.arsdigita.navigation.ui.category.Hierarchy">
       <jsp:scriptlet>
-        ((com.arsdigita.london.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+        ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
       </jsp:scriptlet>
     </define:component>
 

ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow

@@ -5,7 +5,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   xmlns:search="http://rhea.redhat.com/search/1.0"
   xmlns:atoz="http://xmlns.redhat.com/atoz/1.0"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz"

ccm-sci-bundle/web/themes/static/aplaws-generic/consultations-index.xsl

@@ -5,7 +5,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
 <!--

ccm-sci-bundle/web/themes/static/aplaws-generic/content-section-index.xsl

@@ -5,7 +5,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav"
   version="1.0">
 

ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl

@@ -1,7 +1,7 @@
 <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" 
-				xmlns:nav="http://ccm.redhat.com/london/navigation" 
+				xmlns:nav="http://ccm.redhat.com/navigation" 
 				xmlns:search="http://rhea.redhat.com/search/1.0" 
 				xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" 				
 				xmlns:cms="http://www.arsdigita.com/cms/1.0" 	

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

@@ -1,7 +1,7 @@
 <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" 
-				xmlns:nav="http://ccm.redhat.com/london/navigation" 
+				xmlns:nav="http://ccm.redhat.com/navigation" 
 				xmlns:search="http://rhea.redhat.com/search/1.0" 
 				xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" 				
 				xmlns:cms="http://www.arsdigita.com/cms/1.0" 	

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

@@ -1,7 +1,7 @@
 <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" 
-				xmlns:nav="http://ccm.redhat.com/london/navigation" 
+				xmlns:nav="http://ccm.redhat.com/navigation" 
 				xmlns:search="http://rhea.redhat.com/search/1.0" 
 				xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" 				
 				xmlns:cms="http://www.arsdigita.com/cms/1.0" 	

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

@@ -1,7 +1,7 @@
 <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" 
-				xmlns:nav="http://ccm.redhat.com/london/navigation" 
+				xmlns:nav="http://ccm.redhat.com/navigation" 
 				xmlns:search="http://rhea.redhat.com/search/1.0" 
 				xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" 				
 				xmlns:cms="http://www.arsdigita.com/cms/1.0" 	

ccm-sci-bundle/web/themes/static/aplaws-generic/lib/header.xsl

@@ -5,7 +5,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav"
   version="1.0">
 

ccm-sci-bundle/web/themes/static/aplaws-generic/lib/leftNav.xsl

@@ -5,7 +5,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav"
   version="1.0">
 

ccm-sci-bundle/web/themes/static/aplaws-generic/lib/lib.xsl

@@ -5,7 +5,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
 	xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
   exclude-result-prefixes="xsl bebop aplaws ui nav cms terms"
 	version="1.0">
@@ -31,22 +31,22 @@
 
 <div id="utils">
 	<span class="hide">|</span>
-	<a href="{$dispatcher-prefix}/portal/" title="home" accesskey="1">home</a>
+	<a href="{$dispatcher-prefix}/portal/" title="home" accesskey="1">home</a>
-           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|
+           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|
-           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
+           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-        <!--  atoz disabled, currently it only display categories (and indes pages), not content.
+        <!--  atoz disabled, currently it only display categories (and indes pages), not content.
               so, it's not so useful for general content pages 
-	<a href="{$dispatcher-prefix}/atoz" title="a-z">a-z</a><xsl:text disable-output-escaping="yes">&amp;
+	<a href="{$dispatcher-prefix}/atoz" title="a-z">a-z</a><xsl:text disable-output-escaping="yes">&amp;
-           </xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
+           </xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
         -->
-	<a href="{$dispatcher-prefix}/navigation/sitemap.jsp" title="site map" accesskey="3">site map</a>
+	<a href="{$dispatcher-prefix}/navigation/sitemap.jsp" title="site map" accesskey="3">site map</a>
-           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|
+           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|
            <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-	<a href="/contact" title="contact us" accesskey="9">contact us</a>
+	<a href="/contact" title="contact us" accesskey="9">contact us</a>
-           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|
+           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|
+           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
+	<a href="/help" title="help" accesskey="6">help</a>
            <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-	<a href="/help" title="help" accesskey="6">help</a>
-           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
            <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp; 
 </div>
 
@@ -68,7 +68,7 @@
 
 
 
-<!--TOP LEVEL NAVIGATION -->
+<!--TOP LEVEL NAVIGATION -->
 <!--  hard coded navigation arranged horizonally, deactivated 
 <div id="tlcNav">
 
@@ -88,7 +88,7 @@
 
 <!--BREADCRUMB -->
 <xsl:template name="breadcrumb">
-
+
 <span class="hide">|</span>
 <div id="bread">
 <p>
@@ -116,23 +116,23 @@
 </div>
 
 </xsl:template>
-
 
-<!-- aplaws council navigation categories, 
+
-     originally CONFIGURED TO MATCH LGCL TOP CATEGORIES, hard coded 
+<!-- aplaws council navigation categories, 
-     may be used as an example if someone really needs hard coded navigation categories  -->
+     originally CONFIGURED TO MATCH LGCL TOP CATEGORIES, hard coded 
+     may be used as an example if someone really needs hard coded navigation categories  -->
 <!--    deactivated for now
 <xsl:template name="TLC">  
 <span class="hide">|</span>
-<a href="{$dispatcher-prefix}/navigation/first-cat" title="First Category">first categoty</a>
+<a href="{$dispatcher-prefix}/navigation/first-cat" title="First Category">first categoty</a>
-  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
+  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
-  </xsl:text>nbsp;
+  </xsl:text>nbsp;
-<a href="{$dispatcher-prefix}/navigation/second-cat" title="Second Category">second category</a>
+<a href="{$dispatcher-prefix}/navigation/second-cat" title="Second Category">second category</a>
-  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
+  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
-  </xsl:text>nbsp;
+  </xsl:text>nbsp;
-<a href="{$dispatcher-prefix}/navigation/third-cat" title="Third Category">third category</a>
+<a href="{$dispatcher-prefix}/navigation/third-cat" title="Third Category">third category</a>
-  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
+  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
-  </xsl:text>nbsp;
+  </xsl:text>nbsp;
 <a href="{$dispatcher-prefix}/navigation/last-cat" title="Last Category">last category</a>
 </xsl:template>
 
@@ -141,42 +141,42 @@
 
 <xsl:template name="footer">
 <div id="footer">
-
+
-<!-- if you use hard coded navigation categories, you may repeat them at the bottom of each page -->
+<!-- if you use hard coded navigation categories, you may repeat them at the bottom of each page -->
 <!-- deactivated for now
-<p id="foottlc">
+<p id="foottlc">
 <span class="hide">|</span>
-<a href="{$dispatcher-prefix}/navigation/first-cat" title="First Category">first categoty</a>
+<a href="{$dispatcher-prefix}/navigation/first-cat" title="First Category">first categoty</a>
-  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
+  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
-  </xsl:text>nbsp;
+  </xsl:text>nbsp;
-<a href="{$dispatcher-prefix}/navigation/second-cat" title="Second Category">second category</a>
+<a href="{$dispatcher-prefix}/navigation/second-cat" title="Second Category">second category</a>
-  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
+  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
-  </xsl:text>nbsp;
+  </xsl:text>nbsp;
-<a href="{$dispatcher-prefix}/navigation/third-cat" title="Third Category">third category</a>
+<a href="{$dispatcher-prefix}/navigation/third-cat" title="Third Category">third category</a>
-  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
+  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
-  </xsl:text>nbsp;
+  </xsl:text>nbsp;
 <a href="{$dispatcher-prefix}/navigation/last-cat" title="Last Category">last category</a>
-</p>
+</p>
 --> 
 
 <p id="legal"> 
  <span class="hide">|</span>
- <a href="/copyright" title="copyright">copyright</a>
+ <a href="/copyright" title="copyright">copyright</a>
-    <xsl:text disable-output-escaping="yes">&amp;nbsp;|&amp;nbsp;</xsl:text>
+    <xsl:text disable-output-escaping="yes">&amp;nbsp;|&amp;nbsp;</xsl:text>
- <a href="/disclaimer" title="disclaimer and privacy statement" accesskey="8">disclaimer and privacy statement</a>
+ <a href="/disclaimer" title="disclaimer and privacy statement" accesskey="8">disclaimer and privacy statement</a>
-    <xsl:text disable-output-escaping="yes">&amp;nbsp;|&amp;</xsl:text>
+    <xsl:text disable-output-escaping="yes">&amp;nbsp;|&amp;</xsl:text>
- <a href="/contact" title="contact" accesskey="9">contact</a>
+ <a href="/contact" title="contact" accesskey="9">contact</a>
-    <xsl:text disable-output-escaping="yes">&amp;nbsp;|&amp;nbsp;</xsl:text>
+    <xsl:text disable-output-escaping="yes">&amp;nbsp;|&amp;nbsp;</xsl:text>
  <a href="/accessibility" title="accessibility statement" accesskey="0">accessibility</a>
 </p>
 
 
 <p>
 <span class="hide">|</span>
-<a href="http://validator.w3.org/check/referer">
+<a href="http://validator.w3.org/check/referer">
   <img border="0" src="{$theme-prefix}/images/w3c-xhtml.png" alt="Valid HTML 4.01!" height="31" width="88" /></a>
 <span class="hide">|</span>
-<a href="http://jigsaw.w3.org/css-validator/">
+<a href="http://jigsaw.w3.org/css-validator/">
   <img style="border:0;width:88px;height:31px" src="{$theme-prefix}/images/w3c-css.png" alt="Valid CSS!" /></a>
 </p>
 
@@ -337,7 +337,7 @@
 	       				<xsl:value-of select="nav:attribute[@name='launchDate']"/> - 
 	          			<!-- line above displays the locale specific version of the date - personally I think
 	          			     the default long version looks awful - maybe short format can be specified in 
-	          			     com.arsdigita.london.navigation.DataCollectionRenderer. Alternative approach
+	          			     com.arsdigita.navigation.DataCollectionRenderer. Alternative approach
                              is to construct short date with the available attributes eg UK version below 
                              (which could do with some left padding on day & month so that the dates align correctly)
                         <xsl:value-of select="nav:attribute[@name='launchDate']/@day"/>/

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

@@ -4,7 +4,7 @@
                xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
                    xmlns:ui="http://www.arsdigita.com/ui/1.0"
                   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                  xmlns:nav="http://ccm.redhat.com/london/navigation"
+                  xmlns:nav="http://ccm.redhat.com/navigation"
  
     exclude-result-prefixes="xsl bebop aplaws ui cms nav"
                     version="1.0">

ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-sitemap.xsl

@@ -4,7 +4,7 @@
                 xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
                     xmlns:ui="http://www.arsdigita.com/ui/1.0"
                    xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                   xmlns:nav="http://ccm.redhat.com/london/navigation"
+                   xmlns:nav="http://ccm.redhat.com/navigation"
                 xmlns:search="http://rhea.redhat.com/search/1.0"
                   xmlns:atoz="http://xmlns.redhat.com/atoz/1.0"
      exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz"

ccm-sci-bundle/web/themes/static/aplaws-generic/portal-workspace-index.xsl

@@ -5,7 +5,7 @@
              xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
                  xmlns:ui="http://www.arsdigita.com/ui/1.0"
                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                xmlns:nav="http://ccm.redhat.com/london/navigation"
+                xmlns:nav="http://ccm.redhat.com/navigation"
              xmlns:search="http://rhea.redhat.com/search/1.0"
              xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search portal"

ccm-sci-bundle/web/themes/static/aplaws-generic/search-admin.xsl

@@ -6,7 +6,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   xmlns:search="http://rhea.redhat.com/search/1.0"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search"
 	version="1.0">

ccm-sci-bundle/web/themes/static/aplaws-generic/search-index.xsl

@@ -6,22 +6,22 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   xmlns:search="http://rhea.redhat.com/search/1.0"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search"
 	version="1.0">
 
   <xsl:import href="lib/header.xsl"/>
   <xsl:import href="lib/lib.xsl"/>
-
+
   <!-- path if installed in its own web context ccm-ldn-shortcuts 
     <xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
-    <xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/>
+    <xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
   -->
-  <!-- path to xsl if installed in the main (common) web context   
-  -->
   <xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../__ccm__/apps/content-section/xsl/index.xsl"/>
+  <xsl:import href="../../../__ccm__/apps/content-section/xsl/index.xsl"/>
 
   <xsl:param name="context-prefix"/>
   <xsl:param name="dispatcher-prefix" />
@@ -80,17 +80,17 @@
 		<xsl:choose>
 		  <xsl:when test="@id='search'">
 		  <a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search</a><span class="hide">|</span>
-		  <a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search
+		  <a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search
 		  </a><span class="hide">|</span>
 		  </xsl:when>
 		  <xsl:when test="@id='advanced'">
 		  <a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
-		  <a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search
+		  <a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search
 		  </a><span class="hide">|</span>
 		  </xsl:when>
 		  <xsl:when test="@id='remote'">
 			<a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
-			<a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search
+			<a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search
 			</a><span class="hide">|</span>
 		  </xsl:when>
 		  <xsl:otherwise />
@@ -101,7 +101,7 @@
 
     	</td>
       </tr>
-    </table>
+    </table>
 
     <xsl:call-template name="footer"/>
   </xsl:template>
@@ -125,7 +125,7 @@
     </p>
     </div>
   </xsl:template>
-
+
 
   <xsl:template name="searchNav">
     <div id="nav">
@@ -149,7 +149,8 @@
     </xsl:choose>
     <a href="/searchhelp" class="navChild" title="Hints and tips" >Hints and Tips</a><span class="hide">|</span>
     </div>
-  </xsl:template>
+  </xsl:template>
+
 
   <xsl:template name="searchMain">
     <xsl:choose>

ccm-sci-bundle/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl

@@ -6,7 +6,7 @@
                 xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
                 xmlns:ui="http://www.arsdigita.com/ui/1.0"
-                xmlns:nav="http://ccm.redhat.com/london/navigation"
+                xmlns:nav="http://ccm.redhat.com/navigation"
                 exclude-result-prefixes="xsl bebop cms ui"
                 version="1.0">
   

ccm-sci-bundle/web/themes/static/aplaws-generic/types/SiteProxy.xsl

@@ -6,7 +6,7 @@
                 xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
                 xmlns:ui="http://www.arsdigita.com/ui/1.0"
-                xmlns:nav="http://ccm.redhat.com/london/navigation"
+                xmlns:nav="http://ccm.redhat.com/navigation"
                 exclude-result-prefixes="xsl bebop cms ui"
                 version="1.0">