Weitere Anpassungen bei navigation an die Änderungen infolge ccm-sci-bundle.

Dabei ccm-ldn-navigation in ccm-navigation umbenannt, damit nicht demnächst
wieder alle Scripte angepasst werden müssen.

UPDATE SCRIPT erforderlich, hier noch nicht enthalten!



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

ccm-ldn-navigation/src/ccm-ldn-navigation.config

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<registry>
-   <config class="com.arsdigita.london.navigation.NavigationConfig"
-           storage="ccm-ldn-navigation/navigation.properties"/>
-</registry>

ccm-ldn-navigation/src/ccm-ldn-navigation.upgrade

@@ -1,22 +0,0 @@
-<upgrade>
-  <version from="1.4.1" to="1.4.2">
-    <script sql="ccm-ldn-navigation/upgrade/::database::-1.4.1-1.4.2.sql"/>
-    <script class="com.arsdigita.london.navigation.upgrades.Upgrade141to142"/>
-  </version>
-  <version from="1.4.2" to="1.4.3">
-    <script sql="ccm-ldn-navigation/upgrade/::database::-1.4.2-1.4.3.sql"/>
-  </version>
-  <version from="1.4.3" to="1.4.4">
-    <script sql="ccm-ldn-navigation/upgrade/::database::-1.4.3-1.4.4.sql"/>
-  </version>
-  <version from="6.5.0" to="6.5.1">
-    <script sql="ccm-ldn-navigation/upgrade/::database::-6.5.0-6.5.1.sql"/>
-    <script class="com.arsdigita.london.navigation.upgrades.Upgrade650to651"/>
-  </version>
-  <version from="6.6.0" to="6.6.1">
-    <script sql="ccm-ldn-navigation/upgrade/::database::-6.6.0-6.6.1.sql"/>
-  </version>
-  <version from="6.6.1" to="6.6.2">
-    <script sql="ccm-ldn-navigation/upgrade/::database::-6.6.1-6.6.2.sql"/>
-  </version>
-</upgrade>

ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConfig_parameter.properties

@@ -1,89 +0,0 @@
-com.arsdigita.london.navigation.index_page_cache_lifetime.title=Index Page Cache Lifetime
-com.arsdigita.london.navigation.index_page_cache_lifetime.purpose=The cache lifetime for category index pages in seconds. Default 1 hour
-com.arsdigita.london.navigation.index_page_cache_lifetime.example=3600
-com.arsdigita.london.navigation.index_page_cache_lifetime.format=[integer]
-
-com.arsdigita.london.navigation.generate_item_url.title=Generate Item URL
-com.arsdigita.london.navigation.generate_item_url.purpose=Generate full item URLs instead of going via search redirector
-com.arsdigita.london.navigation.generate_item_url.example=true
-com.arsdigita.london.navigation.generate_item_url.format=[boolean]
-
-com.arsdigita.london.navigation.default_template.title=Default Template
-com.arsdigita.london.navigation.default_template.purpose=The default category template
-com.arsdigita.london.navigation.default_template.example=/packages/navigation/templates/default.jsp
-com.arsdigita.london.navigation.default_template.format=[string]
-
-com.arsdigita.london.navigation.inherit_templates.title=Inherit Templates from Parent
-com.arsdigita.london.navigation.inherit_templates.purpose=If no template for category, should it get template from parent, or fall back on default
-com.arsdigita.london.navigation.inherit_templates.example=true|false
-com.arsdigita.london.navigation.inherit_templates.format=[boolean]
-
-com.arsdigita.london.navigation.default_content_section_url.title=Default Content Section URL
-com.arsdigita.london.navigation.default_content_section_url.purpose=The URL of the default content section
-com.arsdigita.london.navigation.default_content_section_url.example=/content/
-com.arsdigita.london.navigation.default_content_section_url.format=[string]
-
-com.arsdigita.london.navigation.related_items_context.title=Related items category use context
-com.arsdigita.london.navigation.related_items_context.purpose=The category use context for the related items query
-com.arsdigita.london.navigation.related_items_context.example=subject
-com.arsdigita.london.navigation.related_items_context.format=[string]
-
-com.arsdigita.london.navigation.related_items_factory.title=Related items factory implementation
-com.arsdigita.london.navigation.related_items_factory.purpose=The implementation of RelatedItemsQueryFactory class
-com.arsdigita.london.navigation.related_items_factory.example=com.arsdigita.london.navigation.RelatedItemsQueryFactoryImpl
-com.arsdigita.london.navigation.related_items_factory.format=[class]
-
-com.arsdigita.london.navigation.default_cat_root_path.title=Default Category Root Path
-com.arsdigita.london.navigation.default_cat_root_path.purpose=The URL of the application whose root category is to be used as the default root category
-com.arsdigita.london.navigation.default_cat_root_path.example=/navigation/
-com.arsdigita.london.navigation.default_cat_root_path.format=[string]
-
-com.arsdigita.london.navigation.default_nav_model.title=Default Navigation Model
-com.arsdigita.london.navigation.default_nav_model.purpose=The class of the default navigation model
-com.arsdigita.london.navigation.default_nav_model.example=com.arsdigita.london.navigation.ApplicationNavigationModel
-com.arsdigita.london.navigation.default_nav_model.format=[class]
-
-com.arsdigita.london.navigation.traversal_adapters.title=XML renderer rules
-com.arsdigita.london.navigation.traversal_adapters.purpose=Name of file with rules for configuring information in generated XML
-com.arsdigita.london.navigation.traversal_adapters.format=[string]
-com.arsdigita.london.navigation.traversal_adapters.example=/WEB-INF/resources/navigation-adapters.xml
-
-com.arsdigita.london.navigation.category_menu_show_nephews.title=Show nephew categories in CategoryMenu
-com.arsdigita.london.navigation.category_menu_show_nephews.purpose=Whether CategoryMenu should display the categories who are nephews to the current category
-com.arsdigita.london.navigation.category_menu_show_nephews.example=false
-com.arsdigita.london.navigation.category_menu_show_nephews.format=[boolean]
-
-com.arsdigita.london.navigation.category_menu_show_grand_children.title=Show grand children categories in CategoryMenu
-com.arsdigita.london.navigation.category_menu_show_grand_children.purpose=Whether CategoryMenu should display the categories which are grand children to the current category. Possible Value: false, adaptiv, true.
-com.arsdigita.london.navigation.category_menu_show_grand_children.example=false
-com.arsdigita.london.navigation.category_menu_show_grand_children.format=[string]
-
-com.arsdigita.london.navigation.category_menu_show_grand_children_max.title=Max. number of grand children shown in the navigation menu with show_grand_children in adaptive mode.
-com.arsdigita.london.navigation.category_menu_show_grand_children_max.purpose=Max. number of grand children shown in the navigation menu with show_grand_children in adaptive mode. Set to 0 to show all.
-com.arsdigita.london.navigation.category_menu_show_grand_children_max.example=0
-com.arsdigita.london.navigation.category_menu_show_grand_children_max.format=[integer]
-
-com.arsdigita.london.navigation.category_menu_show_grand_children_min.title=Min. number of grand children shown in the navigation menu with show_grand_children in adaptive mode.
-com.arsdigita.london.navigation.category_menu_show_grand_children_min.purpose=Min. number of grand children shown in the navigation menu with show_grand_children in adaptive mode. To avoid showing only 1 entry or none at all at a higher level in the navigation menu.
-com.arsdigita.london.navigation.category_menu_show_grand_children_min.example=1
-com.arsdigita.london.navigation.category_menu_show_grand_children_min.format=[integer]
-
-com.arsdigita.london.navigation.category_menu_show_grand_children_limit.title=Limit adaptive mode for show_grand_children to the first n levels
-com.arsdigita.london.navigation.category_menu_show_grand_children_limit.purpose=Limit adaptive mode for show_grand_children to the first n levels. After reaching the limit, fallback to show_grand_children=false.
-com.arsdigita.london.navigation.category_menu_show_grand_children_limit.example=1
-com.arsdigita.london.navigation.category_menu_show_grand_children_limit.format=[integer]
-
-com.arsdigita.london.navigation.date_order_categories.title=Date Order Categories
-com.arsdigita.london.navigation.date_order_categories.purpose=Specify which nav categories should have items sorted by date
-com.arsdigita.london.navigation.date_order_categories.example=68594,345:ascending,687493
-com.arsdigita.london.navigation.date_order_categories.format=[string,string,string]
-
-com.arsdigita.london.navigation.top_level_date_order_categories.title=Top level date order categories
-com.arsdigita.london.navigation.top_level_date_order_categories.purpose=Categories which will have all their children date ordered
-com.arsdigita.london.navigation.top_level_date_order_categories.example=68594,345:ascending
-com.arsdigita.london.navigation.top_level_date_order_categories.format=[string,string,string]
-
-com.arsdigita.london.navigation.default_menu_cat_provider.title=Default Menu Category Provider
-com.arsdigita.london.navigation.default_menu_cat_provider.purpose=Class that provides categories included in menu for any categories that do not have an alternative provider registered
-com.arsdigita.london.navigation.default_menu_cat_provider.example=com.arsdigita.navigation.ui.category.TreeCatProviderImpl
-com.arsdigita.london.navigation.default_menu_cat_provider.format=[class]

ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-atoz.jsp

@@ -1,47 +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).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
-    </jsp:scriptlet>
-  </define:page>
-
-  <show:all/>
-</jsp:root>

ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-default.jsp

@@ -1,84 +0,0 @@
-<!--
-   A default item page (index page) provided by ccm-navigation package. Sites
-   will probably use a customized index page. 
-   Set the actual in dex page to be used by parameter
-      com.arsdigita.london.navigation.default_template
-
-   ##Title: Default Items Page
-   ##Descr: Default Navigation Index Page, ordering items in ascending order
-   ##Path : /templates/ccm-ldn-navigation/navigation/nav-default.jsp
--->
-<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="com.arsdigita.london.navigation.DataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.DataCollectionRenderer"/>
-  
-
-  <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="greetingItemExtraXML"
-      classname="com.arsdigita.london.navigation.ui.GreetingItemExtraXML"/>
-    <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"/>
-    <define:component name="applicationList"
-      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("displayName");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("launchDate");
-      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).setDefinition(new DataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).setRenderer(new DataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().setObjectType("com.arsdigita.web.Application");
-
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().setDescendCategories(false);      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().addOrder("categories.link.sortKey");
-      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getRenderer().addAttribute("displayName");
-      
-    </jsp:scriptlet>
-
-    <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-   <define:component name="dateOrderCategories"
-      classname="com.arsdigita.london.navigation.ui.DateOrderedCategoryComponent"/>
-
-  </define:page>
-  <show:all/>
-</jsp:root>

ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-recent.jsp

@@ -1,48 +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");
-    </jsp:scriptlet>
-  </define:page>
-
-  <show:all/>
-</jsp:root>

ccm-navigation/application.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-ldn-navigation"
+  name="ccm-navigation"
   prettyName="Navigation"
-  version="6.6.2"
+  version="6.6.3"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>

ccm-navigation/doc/calendar.jsp

@@ -6,7 +6,7 @@
 
   <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:scriptlet>
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
@@ -21,16 +21,16 @@
     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="categoryItemList"
-      classname="com.arsdigita.london.navigation.ui.CalendarBrowser"/>
+      classname="com.arsdigita.navigation.ui.CalendarBrowser"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.CalendarBrowser) categoryItemList).addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.CalendarBrowser) categoryItemList).addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.CalendarBrowser) categoryItemList).setHowMany(30);
+      ((com.arsdigita.navigation.ui.CalendarBrowser) categoryItemList).setHowMany(30);
       itemPage.addGlobalStateParam(new BigDecimalParameter("categoryID"));
     </jsp:scriptlet>
   </define:page>

ccm-navigation/doc/directory.xsd

@@ -15,7 +15,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.DirectoryComponent</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.DirectoryComponent</gen:class>
       </xs:appinfo>
     </xs:annotation>
 

ccm-navigation/doc/experimental/AbstractComponentWrapper.java

@@ -17,7 +17,7 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 
 public abstract class AbstractComponentWrapper extends AbstractComponent 

ccm-navigation/doc/experimental/ComponentWrapper.java

@@ -17,7 +17,7 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 
 public interface ComponentWrapper extends Component {

ccm-navigation/doc/experimental/DevSupportComponentWrapper.java

@@ -17,7 +17,7 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.developersupport.DeveloperSupport;
 import com.arsdigita.webdevsupport.RequestInfo;

ccm-navigation/doc/navigation.xsd

@@ -12,7 +12,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Root</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Root</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -31,7 +31,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.TopLevel</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.TopLevel</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -50,7 +50,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Siblings</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Siblings</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -68,7 +68,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Children</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Children</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -87,7 +87,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Path</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Path</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -108,7 +108,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Menu</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Menu</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -127,7 +127,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Hierarchy</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Hierarchy</gen:class>
       </xs:appinfo>
     </xs:annotation>
 

ccm-navigation/pdl/com/arsdigita/navigation/ContentTypes.pdl

@@ -1,4 +1,4 @@
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 query TypesInSection {
     BigDecimal typeID;

ccm-navigation/pdl/com/arsdigita/navigation/Navigation.pdl

@@ -1,4 +1,4 @@
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 import com.arsdigita.web.Application;
 

ccm-navigation/pdl/com/arsdigita/navigation/QuickLink.pdl

@@ -16,7 +16,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 import com.arsdigita.kernel.ACSObject;
 

ccm-navigation/pdl/com/arsdigita/navigation/Template.pdl

@@ -1,4 +1,4 @@
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 

ccm-navigation/pdl/com/arsdigita/navigation/portlet/ItemListPortlet.pdl

@@ -16,7 +16,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 
-model com.arsdigita.london.navigation.portlet;
+model com.arsdigita.navigation.portlet;
 
 
 object type ItemListPortlet extends ObjectListPortlet {

ccm-navigation/pdl/com/arsdigita/navigation/portlet/NavigationDirectoryPortlet.pdl

@@ -14,9 +14,9 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  
-model com.arsdigita.london.navigation.portlet;
+model com.arsdigita.navigation.portlet;
 
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.portal.Portlet;
 
 object type NavigationTreePortlet extends Portlet {

ccm-navigation/pdl/com/arsdigita/navigation/portlet/ObjectListPortlet.pdl

@@ -15,7 +15,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-model com.arsdigita.london.navigation.portlet;
+model com.arsdigita.navigation.portlet;
 
 import com.arsdigita.portal.Portlet;
 import com.arsdigita.categorization.Category;

ccm-navigation/pdl/com/arsdigita/navigation/query-PopulatedSubCategories.pdl

@@ -1,4 +1,4 @@
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 
 import com.arsdigita.kernel.ACSObject;

ccm-navigation/pdl/com/arsdigita/navigation/query-RelatedItems.ora.pdl

@@ -12,7 +12,7 @@
 // rights and limitations under the License.
 //
 
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 // This query returns related items with an exact category map,
 // It has replaced the one below since, although it is technically

ccm-navigation/pdl/com/arsdigita/navigation/query-RelatedItems.pg.pdl

@@ -12,7 +12,7 @@
 // rights and limitations under the License.
 //
 
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 // This query returns related items with an exact category map,
 // It has replaced the one below since, although it is technically

ccm-navigation/src/WEB-INF/resources/navigation-adapters.xml

@@ -4,8 +4,8 @@
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd">
 
-  <xrd:context name="com.arsdigita.london.navigation.ui.QuickLinks">
+  <xrd:context name="com.arsdigita.navigation.ui.QuickLinks">
-    <xrd:adapter objectType="com.arsdigita.london.navigation.QuickLink">
+    <xrd:adapter objectType="com.arsdigita.navigation.QuickLink">
       <xrd:attributes rule="exclude">
         <xrd:property name="/object/id"/>
         <xrd:property name="/object/objectType"/>
@@ -15,8 +15,8 @@
     </xrd:adapter>
   </xrd:context>
 
-  <xrd:context name="com.arsdigita.london.navigation.ui.admin.QuickLinkListing">
+  <xrd:context name="com.arsdigita.navigation.ui.admin.QuickLinkListing">
-    <xrd:adapter objectType="com.arsdigita.london.navigation.QuickLink">
+    <xrd:adapter objectType="com.arsdigita.navigation.QuickLink">
       <xrd:attributes rule="exclude">
         <xrd:property name="/object/id"/>
         <xrd:property name="/object/objectType"/>

ccm-navigation/src/ccm-navigation.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<registry>
+   <config class="com.arsdigita.navigation.NavigationConfig"
+           storage="ccm-navigation/navigation.properties"/>
+</registry>

ccm-navigation/src/ccm-navigation.load

@@ -8,10 +8,10 @@
     <initializer class="com.arsdigita.london.util.Initializer"/>
   </requires>
   <provides>
-    <initializer class="com.arsdigita.london.navigation.Initializer"/>
+    <initializer class="com.arsdigita.navigation.Initializer"/>
   </provides>
   <scripts>
-    <schema directory="ccm-ldn-navigation"/>
+    <schema directory="ccm-navigation"/>
-    <data class="com.arsdigita.london.navigation.Loader"/>
+    <data class="com.arsdigita.navigation.Loader"/>
   </scripts>
 </load>

ccm-navigation/src/ccm-navigation.upgrade

@@ -0,0 +1,22 @@
+<upgrade>
+  <version from="1.4.1" to="1.4.2">
+    <script sql="ccm-navigation/upgrade/::database::-1.4.1-1.4.2.sql"/>
+    <script class="com.arsdigita.navigation.upgrades.Upgrade141to142"/>
+  </version>
+  <version from="1.4.2" to="1.4.3">
+    <script sql="ccm-navigation/upgrade/::database::-1.4.2-1.4.3.sql"/>
+  </version>
+  <version from="1.4.3" to="1.4.4">
+    <script sql="ccm-navigation/upgrade/::database::-1.4.3-1.4.4.sql"/>
+  </version>
+  <version from="6.5.0" to="6.5.1">
+    <script sql="ccm-navigation/upgrade/::database::-6.5.0-6.5.1.sql"/>
+    <script class="com.arsdigita.navigation.upgrades.Upgrade650to651"/>
+  </version>
+  <version from="6.6.0" to="6.6.1">
+    <script sql="ccm-navigation/upgrade/::database::-6.6.0-6.6.1.sql"/>
+  </version>
+  <version from="6.6.1" to="6.6.2">
+    <script sql="ccm-navigation/upgrade/::database::-6.6.1-6.6.2.sql"/>
+  </version>
+</upgrade>

ccm-navigation/src/com/arsdigita/navigation/AbstractNavigationModel.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.kernel.ACSObject;

ccm-navigation/src/com/arsdigita/navigation/AddNavigation.java

@@ -1,4 +1,4 @@
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.domain.DomainObject;
 import com.arsdigita.domain.DomainObjectFactory;

ccm-navigation/src/com/arsdigita/navigation/ApplicationNavigationModel.java

@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
-import com.arsdigita.london.navigation.cms.CMSNavigationModel;
+import com.arsdigita.navigation.cms.CMSNavigationModel;
 import com.arsdigita.london.util.TransactionLocal;
 
 import com.arsdigita.categorization.Category;

ccm-navigation/src/com/arsdigita/navigation/CategoryWidget.java

@@ -2,7 +2,7 @@
  * This is a specialised version of com.arsdigita.cms.ui.authoring.CategoryWidget
  * which adds an isEmpty attribute to the category elements.
  */
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

ccm-navigation/src/com/arsdigita/navigation/CookieNavigationModel.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

ccm-navigation/src/com/arsdigita/navigation/DataCollectionDefinition.java

@@ -15,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.categorization.Category;
@@ -244,7 +244,7 @@ public class DataCollectionDefinition extends LockableImpl {
 
         if (m_blackListTypes) {
             objects.addNotInSubqueryFilter(ACSObject.OBJECT_TYPE,
-                                           "com.arsdigita.london.navigation.blackListTypes");
+                                           "com.arsdigita.navigation.blackListTypes");
         }
 
         Category cat = getCategory(model);

ccm-navigation/src/com/arsdigita/navigation/DataCollectionProperty.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.persistence.DataCollection;
 

ccm-navigation/src/com/arsdigita/navigation/DataCollectionPropertyRenderer.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.xml.Element;

ccm-navigation/src/com/arsdigita/navigation/DataCollectionRenderer.java

@@ -15,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
 import com.arsdigita.domain.DomainObjectFactory;

ccm-navigation/src/com/arsdigita/navigation/DefaultNavigationModel.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.kernel.ACSObject;

ccm-navigation/src/com/arsdigita/navigation/DomainNavigationModel.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.kernel.ACSObject;

ccm-navigation/src/com/arsdigita/navigation/GenericNavigationModel.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.kernel.ACSObject;

ccm-navigation/src/com/arsdigita/navigation/GlobalNavigationModel.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.kernel.ACSObject;

ccm-navigation/src/com/arsdigita/navigation/Initializer.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
@@ -59,12 +59,12 @@ import com.arsdigita.kernel.ResourceType;
 import com.arsdigita.kernel.ui.ResourceConfigFormSection;
 import com.arsdigita.bebop.RequestLocal;
 
-import com.arsdigita.london.navigation.portlet.NavigationTreePortlet;
+import com.arsdigita.navigation.portlet.NavigationTreePortlet;
-import com.arsdigita.london.navigation.portlet.ObjectListPortlet;
+import com.arsdigita.navigation.portlet.ObjectListPortlet;
-import com.arsdigita.london.navigation.portlet.ItemListPortlet;
+import com.arsdigita.navigation.portlet.ItemListPortlet;
 
-import com.arsdigita.london.navigation.ui.portlet.ObjectListPortletEditor;
+import com.arsdigita.navigation.ui.portlet.ObjectListPortletEditor;
-import com.arsdigita.london.navigation.ui.portlet.ItemListPortletEditor;
+import com.arsdigita.navigation.ui.portlet.ItemListPortletEditor;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -78,7 +78,7 @@ import com.arsdigita.domain.xml.TraversalHandler;
 import com.arsdigita.xml.XML;
 
 /**
- * Initializer for ccm-ldn-navigation.
+ * Initializer for ccm-navigation.
  * Executes recursivly at each system startup.
  *
  * @author Justin Ross <jross@redhat.com>
@@ -97,7 +97,7 @@ public class Initializer extends CompoundInitializer {
 
         add(new PDLInitializer
             (new ManifestSource
-             ("ccm-ldn-navigation.pdl.mf",
+             ("ccm-navigation.pdl.mf",
               new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl"))));
     }
 

ccm-navigation/src/com/arsdigita/navigation/Loader.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.KernelExcursion;
@@ -28,9 +28,9 @@ import com.arsdigita.util.parameter.StringParameter;
 import com.arsdigita.web.Application;
 import com.arsdigita.web.ApplicationType;
 
-import com.arsdigita.london.navigation.portlet.ObjectListPortlet;
+import com.arsdigita.navigation.portlet.ObjectListPortlet;
-import com.arsdigita.london.navigation.portlet.ItemListPortlet;
+import com.arsdigita.navigation.portlet.ItemListPortlet;
-import com.arsdigita.london.navigation.portlet.NavigationTreePortlet;
+import com.arsdigita.navigation.portlet.NavigationTreePortlet;
 
 import com.arsdigita.portal.PortletType;
 
@@ -54,7 +54,7 @@ public class Loader extends PackageLoader {
     private static final Logger s_log = Logger.getLogger(Loader.class);
 
     private StringParameter m_templatesFile = new StringParameter(
-        "com.arsdigita.london.navigation.templates_file",
+        "com.arsdigita.navigation.templates_file",
         Parameter.REQUIRED,
         "WEB-INF/navigation/templates.txt");
 

ccm-navigation/src/com/arsdigita/navigation/Navigation.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
@@ -35,7 +35,7 @@ public class Navigation extends Application {
     private static final Logger logger = Logger.getLogger(Navigation.class);
 
     public static final String NAV_NS =
-        "http://ccm.redhat.com/london/navigation";
+        "http://ccm.redhat.com/navigation";
     public static final String NAV_PREFIX = "nav";
     public static final String OID = "oid";
 
@@ -93,7 +93,7 @@ public class Navigation extends Application {
 
 
     public static final String BASE_DATA_OBJECT_TYPE 
-        = "com.arsdigita.london.navigation.Navigation";
+        = "com.arsdigita.navigation.Navigation";
 
     public Navigation(DataObject obj) {
         super(obj);
@@ -105,7 +105,7 @@ public class Navigation extends Application {
 
     /*
     public String getContextPath() {
-        return "ccm-ldn-navigation";
+        return "ccm-navigation";
     }
     */
 
@@ -123,25 +123,26 @@ public class Navigation extends Application {
      *   <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>com.arsdigita.navigation.NavigationFileResolver
      *     </param-value>
      *   </init-param>
      * </servlet>
      *
      * <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>
      *
      * @return path to the applications servlet/JSP
      */
+    @Override
     public String getServletPath() {
         //return "/files";
-        return "/ccm-ldn-navigation/files";
+        return "/ccm-navigation/files";
     }
 
 }

ccm-navigation/src/com/arsdigita/navigation/NavigationConfig.java

@@ -16,15 +16,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.RequestLocal;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
 import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.london.navigation.ui.category.Menu;
+import com.arsdigita.navigation.ui.category.Menu;
-import com.arsdigita.london.navigation.ui.category.TreeCatProvider;
+import com.arsdigita.navigation.ui.category.TreeCatProvider;
 import com.arsdigita.runtime.AbstractConfig;
 import com.arsdigita.util.Assert;
 import com.arsdigita.util.StringUtils;
@@ -58,18 +58,18 @@ public final class NavigationConfig extends AbstractConfig {
 
     /** The cache lifetime for category index pages in seconds. Default 1 hour */
     private final Parameter m_indexPageCacheLifetime = new IntegerParameter
-            ("com.arsdigita.london.navigation.index_page_cache_lifetime",
+            ("com.arsdigita.navigation.index_page_cache_lifetime",
              Parameter.REQUIRED, new Integer(3600));
     
     /** Generate full item URLs instead of going via search redirector. Default true */
     private final Parameter m_generateItemURL = new BooleanParameter
-            ("com.arsdigita.london.navigation.generate_item_url",
+            ("com.arsdigita.navigation.generate_item_url",
              Parameter.REQUIRED, new Boolean(true));
     
     /** The default category template.                                        */
     private final Parameter m_defaultTemplate = new StringParameter
-            ("com.arsdigita.london.navigation.default_template",
+            ("com.arsdigita.navigation.default_template",
-             Parameter.REQUIRED, "/templates/ccm-ldn-navigation/navigation/nav-default.jsp");
+             Parameter.REQUIRED, "/templates/ccm-navigation/navigation/nav-default.jsp");
     
     /** If no template for category, should it get template from parent, or
      * fall back on default? Default: true */
@@ -114,55 +114,50 @@ public final class NavigationConfig extends AbstractConfig {
     public NavigationConfig() {
 	// not desirable default value (IMHO) but retains existing behaviour
         m_inheritTemplates = new BooleanParameter
-            ("com.arsdigita.london.navigation.inherit_templates",
+            ("com.arsdigita.navigation.inherit_templates",
             Parameter.REQUIRED, new Boolean(true));
-        // Removed, use content-section config directly instead!
-        // ContentSection.getConfig().getDefaultContentSection()
-        // m_defaultContentSectionURL = new StringParameter
-        //     ("com.arsdigita.london.navigation.default_content_section_url",
-        //      Parameter.REQUIRED, "/content/");
         m_relatedItemsContext = new StringParameter
-            ("com.arsdigita.london.navigation.related_items_context",
+            ("com.arsdigita.navigation.related_items_context",
              Parameter.REQUIRED, "subject");
         m_defaultModelClass = new StringParameter
-            ("com.arsdigita.london.navigation.default_nav_model",
+            ("com.arsdigita.navigation.default_nav_model",
              Parameter.REQUIRED, ApplicationNavigationModel.class.getName());
         m_defaultCatRootPath = new StringParameter
-            ("com.arsdigita.london.navigation.default_cat_root_path",
+            ("com.arsdigita.navigation.default_cat_root_path",
              Parameter.REQUIRED, "/navigation/");
         m_relatedItemsFactory = new ClassParameter
-            ("com.arsdigita.london.navigation.related_items_factory",
+            ("com.arsdigita.navigation.related_items_factory",
              Parameter.REQUIRED, RelatedItemsQueryFactoryImpl.class);
         m_traversalAdapters = new ResourceParameter
-            ("com.arsdigita.london.navigation.traversal_adapters", 
+            ("com.arsdigita.navigation.traversal_adapters", 
              Parameter.REQUIRED,
              "/WEB-INF/resources/navigation-adapters.xml");
         m_categoryMenuShowNephews = new BooleanParameter
-            ("com.arsdigita.london.navigation.category_menu_show_nephews",
+            ("com.arsdigita.navigation.category_menu_show_nephews",
              Parameter.OPTIONAL, new Boolean(false));
 
         // Quasimodo: Begin
         m_categoryMenuShowGrandChildren = new StringParameter
-            ("com.arsdigita.london.navigation.category_menu_show_grand_children",
+            ("com.arsdigita.navigation.category_menu_show_grand_children",
              Parameter.OPTIONAL, "false");
         m_categoryMenuShowGrandChildrenMax = new IntegerParameter
-                ("com.arsdigita.london.navigation.category_menu_show_grand_children_max",
+                ("com.arsdigita.navigation.category_menu_show_grand_children_max",
                 Parameter.OPTIONAL, new Integer(0));
         m_categoryMenuShowGrandChildrenMin = new IntegerParameter
-                ("com.arsdigita.london.navigation.category_menu_show_grand_children_min",
+                ("com.arsdigita.navigation.category_menu_show_grand_children_min",
                 Parameter.OPTIONAL, new Integer(1));
         m_categoryMenuShowGrandChildrenLimit = new IntegerParameter
-                ("com.arsdigita.london.navigation.category_menu_show_grand_children_limit",
+                ("com.arsdigita.navigation.category_menu_show_grand_children_limit",
                 Parameter.OPTIONAL, new Integer(1));
         // Quasimodo: End
         m_dateOrderCategories = new StringArrayParameter
-            ("com.arsdigita.london.navigation.date_order_categories",
+            ("com.arsdigita.navigation.date_order_categories",
              Parameter.OPTIONAL, new String[0]);
         m_topLevelDateOrderCategories = new StringArrayParameter
-            ("com.arsdigita.london.navigation.top_level_date_order_categories",
+            ("com.arsdigita.navigation.top_level_date_order_categories",
             Parameter.OPTIONAL, new String[0]);
         m_defaultMenuCatProvider = new ClassParameter
-            ("com.arsdigita.london.navigation.default_menu_cat_provider",
+            ("com.arsdigita.navigation.default_menu_cat_provider",
             Parameter.OPTIONAL, null);
 
         register(m_indexPageCacheLifetime);
@@ -195,7 +190,7 @@ public final class NavigationConfig extends AbstractConfig {
         if( param.equals("false") || param.equals("adaptive") || param.equals("true")) {
             set(m_categoryMenuShowGrandChildren, param);
         } else {
-            s_log.error("com.arsdigita.london.navigation.category_menu_show_grand_children: "+
+            s_log.error("com.arsdigita.navigation.category_menu_show_grand_children: "+
                         "Invalid setting " + param + ". Falling back to false.");
             set(m_categoryMenuShowGrandChildren, "false");            
         }

ccm-navigation/src/com/arsdigita/navigation/NavigationConfig_parameter.properties

@@ -0,0 +1,89 @@
+com.arsdigita.navigation.index_page_cache_lifetime.title=Index Page Cache Lifetime
+com.arsdigita.navigation.index_page_cache_lifetime.purpose=The cache lifetime for category index pages in seconds. Default 1 hour
+com.arsdigita.navigation.index_page_cache_lifetime.example=3600
+com.arsdigita.navigation.index_page_cache_lifetime.format=[integer]
+
+com.arsdigita.navigation.generate_item_url.title=Generate Item URL
+com.arsdigita.navigation.generate_item_url.purpose=Generate full item URLs instead of going via search redirector
+com.arsdigita.navigation.generate_item_url.example=true
+com.arsdigita.navigation.generate_item_url.format=[boolean]
+
+com.arsdigita.navigation.default_template.title=Default Template
+com.arsdigita.navigation.default_template.purpose=The default category template
+com.arsdigita.navigation.default_template.example=/templates/ccm-navigation/navigation/nav-default.jsp
+com.arsdigita.navigation.default_template.format=[string]
+
+com.arsdigita.navigation.inherit_templates.title=Inherit Templates from Parent
+com.arsdigita.navigation.inherit_templates.purpose=If no template for category, should it get template from parent, or fall back on default
+com.arsdigita.navigation.inherit_templates.example=true|false
+com.arsdigita.navigation.inherit_templates.format=[boolean]
+
+com.arsdigita.navigation.default_content_section_url.title=Default Content Section URL
+com.arsdigita.navigation.default_content_section_url.purpose=The URL of the default content section
+com.arsdigita.navigation.default_content_section_url.example=/content/
+com.arsdigita.navigation.default_content_section_url.format=[string]
+
+com.arsdigita.navigation.related_items_context.title=Related items category use context
+com.arsdigita.navigation.related_items_context.purpose=The category use context for the related items query
+com.arsdigita.navigation.related_items_context.example=subject
+com.arsdigita.navigation.related_items_context.format=[string]
+
+com.arsdigita.navigation.related_items_factory.title=Related items factory implementation
+com.arsdigita.navigation.related_items_factory.purpose=The implementation of RelatedItemsQueryFactory class
+com.arsdigita.navigation.related_items_factory.example=com.arsdigita.navigation.RelatedItemsQueryFactoryImpl
+com.arsdigita.navigation.related_items_factory.format=[class]
+
+com.arsdigita.navigation.default_cat_root_path.title=Default Category Root Path
+com.arsdigita.navigation.default_cat_root_path.purpose=The URL of the application whose root category is to be used as the default root category
+com.arsdigita.navigation.default_cat_root_path.example=/navigation/
+com.arsdigita.navigation.default_cat_root_path.format=[string]
+
+com.arsdigita.navigation.default_nav_model.title=Default Navigation Model
+com.arsdigita.navigation.default_nav_model.purpose=The class of the default navigation model
+com.arsdigita.navigation.default_nav_model.example=com.arsdigita.navigation.ApplicationNavigationModel
+com.arsdigita.navigation.default_nav_model.format=[class]
+
+com.arsdigita.navigation.traversal_adapters.title=XML renderer rules
+com.arsdigita.navigation.traversal_adapters.purpose=Name of file with rules for configuring information in generated XML
+com.arsdigita.navigation.traversal_adapters.format=[string]
+com.arsdigita.navigation.traversal_adapters.example=/WEB-INF/resources/navigation-adapters.xml
+
+com.arsdigita.navigation.category_menu_show_nephews.title=Show nephew categories in CategoryMenu
+com.arsdigita.navigation.category_menu_show_nephews.purpose=Whether CategoryMenu should display the categories who are nephews to the current category
+com.arsdigita.navigation.category_menu_show_nephews.example=false
+com.arsdigita.navigation.category_menu_show_nephews.format=[boolean]
+
+com.arsdigita.navigation.category_menu_show_grand_children.title=Show grand children categories in CategoryMenu
+com.arsdigita.navigation.category_menu_show_grand_children.purpose=Whether CategoryMenu should display the categories which are grand children to the current category. Possible Value: false, adaptiv, true.
+com.arsdigita.navigation.category_menu_show_grand_children.example=false
+com.arsdigita.navigation.category_menu_show_grand_children.format=[string]
+
+com.arsdigita.navigation.category_menu_show_grand_children_max.title=Max. number of grand children shown in the navigation menu with show_grand_children in adaptive mode.
+com.arsdigita.navigation.category_menu_show_grand_children_max.purpose=Max. number of grand children shown in the navigation menu with show_grand_children in adaptive mode. Set to 0 to show all.
+com.arsdigita.navigation.category_menu_show_grand_children_max.example=0
+com.arsdigita.navigation.category_menu_show_grand_children_max.format=[integer]
+
+com.arsdigita.navigation.category_menu_show_grand_children_min.title=Min. number of grand children shown in the navigation menu with show_grand_children in adaptive mode.
+com.arsdigita.navigation.category_menu_show_grand_children_min.purpose=Min. number of grand children shown in the navigation menu with show_grand_children in adaptive mode. To avoid showing only 1 entry or none at all at a higher level in the navigation menu.
+com.arsdigita.navigation.category_menu_show_grand_children_min.example=1
+com.arsdigita.navigation.category_menu_show_grand_children_min.format=[integer]
+
+com.arsdigita.navigation.category_menu_show_grand_children_limit.title=Limit adaptive mode for show_grand_children to the first n levels
+com.arsdigita.navigation.category_menu_show_grand_children_limit.purpose=Limit adaptive mode for show_grand_children to the first n levels. After reaching the limit, fallback to show_grand_children=false.
+com.arsdigita.navigation.category_menu_show_grand_children_limit.example=1
+com.arsdigita.navigation.category_menu_show_grand_children_limit.format=[integer]
+
+com.arsdigita.navigation.date_order_categories.title=Date Order Categories
+com.arsdigita.navigation.date_order_categories.purpose=Specify which nav categories should have items sorted by date
+com.arsdigita.navigation.date_order_categories.example=68594,345:ascending,687493
+com.arsdigita.navigation.date_order_categories.format=[string,string,string]
+
+com.arsdigita.navigation.top_level_date_order_categories.title=Top level date order categories
+com.arsdigita.navigation.top_level_date_order_categories.purpose=Categories which will have all their children date ordered
+com.arsdigita.navigation.top_level_date_order_categories.example=68594,345:ascending
+com.arsdigita.navigation.top_level_date_order_categories.format=[string,string,string]
+
+com.arsdigita.navigation.default_menu_cat_provider.title=Default Menu Category Provider
+com.arsdigita.navigation.default_menu_cat_provider.purpose=Class that provides categories included in menu for any categories that do not have an alternative provider registered
+com.arsdigita.navigation.default_menu_cat_provider.example=com.arsdigita.navigation.ui.category.TreeCatProviderImpl
+com.arsdigita.navigation.default_menu_cat_provider.format=[class]

ccm-navigation/src/com/arsdigita/navigation/NavigationConstants.java

@@ -1,12 +1,12 @@
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 public class NavigationConstants {
 
     public static final String NAV_NS =
-        "http://ccm.redhat.com/london/navigation";
+        "http://ccm.redhat.com/navigation";
     public static final String NAV_PREFIX = "nav";
     public static final String DEFAULT_CONTENT_SECTION_URL =
-        "com.arsdigita.london.navigation.DefaultContentSection";
+        "com.arsdigita.navigation.DefaultContentSection";
 
     public static final String OID = "oid";
     

ccm-navigation/src/com/arsdigita/navigation/NavigationContext.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.cms.TemplateContext;
 import com.arsdigita.web.Web;

ccm-navigation/src/com/arsdigita/navigation/NavigationFileResolver.java

@@ -15,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 
 import java.math.BigDecimal;
@@ -26,7 +26,7 @@ import javax.servlet.RequestDispatcher;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+// import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 
@@ -60,6 +60,7 @@ public class NavigationFileResolver extends DefaultApplicationFileResolver {
 	public static final String PATH_COOKIE_NAME = "ad_path";
 	public static final char PATH_COOKIE_SEPARATOR = '|';
 	
+    @Override
     public RequestDispatcher resolve(String templatePath,
                                      HttpServletRequest sreq,
                                      HttpServletResponse sresp,

ccm-navigation/src/com/arsdigita/navigation/NavigationModel.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.kernel.ACSObject;

ccm-navigation/src/com/arsdigita/navigation/QuickLink.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.persistence.DataObject;
@@ -30,7 +30,7 @@ import java.net.MalformedURLException;
 public class QuickLink extends ACSObject {
 
     public static final String BASE_DATA_OBJECT_TYPE =
-        "com.arsdigita.london.navigation.QuickLink";
+        "com.arsdigita.navigation.QuickLink";
 
     public static final String TITLE = "title";
     public static final String DESCRIPTION = "description";

ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQuery.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.domain.DomainQuery;
 import java.math.BigDecimal;

ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQueryFactory.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 
 import com.arsdigita.util.Classes;

ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQueryFactoryImpl.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentPage;

ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQueryImpl.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.categorization.Category;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 class RelatedItemsQueryImpl extends RelatedItemsQuery {
 
     public static final String QUERY_NAME = 
-        "com.arsdigita.london.navigation.RelatedItems";
+        "com.arsdigita.navigation.RelatedItems";
     
     public static final String BUNDLE_ID = "bundleID";
     public static final String BUNDLE_IDS = "bundleIDs";

ccm-navigation/src/com/arsdigita/navigation/Template.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 
 import com.arsdigita.categorization.Category;
@@ -52,11 +52,11 @@ public class Template extends DomainObject {
     public static final String DEFAULT_USE_CONTEXT = "default";
 
     public static final String BASE_DATA_OBJECT_TYPE = 
-        "com.arsdigita.london.navigation.Template";
+        "com.arsdigita.navigation.Template";
 
     // used by findBestForCategory
     private static final String TEMPLATES_FOR_CATEGORY = 
-        "com.arsdigita.london.navigation.getTemplatesForCategory";
+        "com.arsdigita.navigation.getTemplatesForCategory";
 
     protected Template() {
         this(BASE_DATA_OBJECT_TYPE);