Weitere Anpassungen an Umbenennung ccm-navigation.

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

ccm-bundle/bundles/demo/themes/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-bundle/bundles/devel/themes/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-bundle/web/packages/content-section/www/person4homepages.jsp

@@ -1,49 +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="person"
-                 application="content"
-                 title="person4Homepages"
-                 cache="false">
-
-        <define:component name="personList"
-                          classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
-        <jsp:scriptlet>
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).setDefinition(new CMSDataCollectionDefinition());
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).setRenderer(new CMSDataCollectionRenderer());
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.GenericPerson");
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getRenderer().setSpecializeObjects(true);
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setDescendCategories(true);
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setExcludeIndexObjects(false);
-	((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setFilterCategory(false);
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getRenderer().setPageSize(99999);
-        if((request.getParameterMap().get("DaBInId") != null) &amp;&amp; (((String[])request.getParameterMap().get("DaBInId")).length &gt; 0)) {
-          String[] params = (String[]) request.getParameterMap().get("DaBInId");
-          String dabinid = params[0];
-          ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).setSQLFilter(String.format("pageDescription LIKE '%%DaBInId={%s}%%'", dabinid));
-        }
-
-        </jsp:scriptlet>
-    </define:page>
-
-    <show:all/>
-
-</jsp:root>

ccm-bundle/web/packages/content-section/www/projects4homepages.jsp

@@ -1,52 +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="publications"
-                 application="content"
-                 title="Publications4Homepages"
-                 cache="false">
-
-        <define:component name="projectList"
-                          classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
-        <jsp:scriptlet>
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).setDefinition(new CMSDataCollectionDefinition());
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).setRenderer(new CMSDataCollectionRenderer());
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.SciProject");
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setSpecializeObjects(true);
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setDescendCategories(true);
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setExcludeIndexObjects(false);
-	((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setFilterCategory(false);
-	((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setAddOrder("title");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setSpecializeObjectsContext("sciProjectList");
-        if((request.getParameterMap().get("DaBInId") != null) &amp;&amp; (((String[])request.getParameterMap().get("DaBInId")).length &gt; 0)) {
-          String[] params = (String[]) request.getParameterMap().get("DaBInId");
-          String dabinid = params[0];
-          ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).setSQLFilter(String.format("persons.pageDescription LIKE '%%DaBInId={%s}%%'", dabinid));
-
-        }
-
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setPageSize(99999);
-        </jsp:scriptlet>
-    </define:page>
-
-    <show:all/>
-
-</jsp:root>

ccm-bundle/web/packages/content-section/www/publications4homepages.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="publications"
-                 application="content"                 
-                 title="Publications4Homepages"
-                 cache="false">
-
-        <define:component name="publicationList"
-                          classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
-        <jsp:scriptlet>
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).setDefinition(new CMSDataCollectionDefinition());
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).setRenderer(new CMSDataCollectionRenderer());
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Publication");
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getRenderer().setSpecializeObjects(true);
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setDescendCategories(true);        
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setExcludeIndexObjects(false);
-	((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setFilterCategory(false);
-	((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().addOrder("yearOfPublication desc");
-        if((request.getParameterMap().get("DaBInId") != null) &amp;&amp; (((String[])request.getParameterMap().get("DaBInId")).length &gt; 0)) {
-          String[] params = (String[]) request.getParameterMap().get("DaBInId");
-          String dabinid = params[0];          
-          ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).setSQLFilter(String.format("authors.pageDescription LIKE '%%DaBInId={%s}%%'", dabinid));
-          
-        } 
-
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getRenderer().setPageSize(99999);
-        </jsp:scriptlet>
-    </define:page>
-
-    <show:all/>
-
-</jsp:root>

ccm-bundle/web/templates/ccm-navigation/services/summary.jsp

@@ -13,9 +13,9 @@
     title="APLAWS" 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="itemSummary"
       classname="com.arsdigita.aplaws.ui.TermItemSummary"/>
 

ccm-sci-bundle/bundles/demo/themes/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/themes/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-std/templates/ccm-navigation/navigation/SciDepartment-index.jsp

@@ -26,7 +26,7 @@
     <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.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.navigation.ui.GreetingItem) greetingItem).getObject();
         ((com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel) sectionXML).setContentItem(item);
     </jsp:scriptlet>
     <define:component name="categoryPath"

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

@@ -28,7 +28,7 @@
         <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",
+            ((com.arsdigita.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();

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,28 +26,28 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+            ((com.arsdigita.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.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.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,21 +26,21 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+            ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
                              SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
         </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,31 +26,31 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet><![CDATA[
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+            ((com.arsdigita.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/projects");
+        ((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/projects");
 
         java.util.Calendar today = new java.util.GregorianCalendar();
         String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
                                                 today.get(java.util.Calendar.MONTH) + 1,
                                                 today.get(java.util.Calendar.DAY_OF_MONTH));
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend <= '" + todayDate + "'");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend <= '" + todayDate + "'");
 
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         ]]></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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,27 +26,27 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+            ((com.arsdigita.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).setOrder("surname asc, givenname asc");
+        ((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).setOrder("surname asc, givenname asc");
 
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,26 +26,26 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+            ((com.arsdigita.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).setOrder("surname asc, givenname asc");
+        ((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).setOrder("surname asc, givenname asc");
 
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,31 +26,31 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet><![CDATA[
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+            ((com.arsdigita.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/projects");
+        ((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/projects");
 
         java.util.Calendar today = new java.util.GregorianCalendar();
         String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
                                                 today.get(java.util.Calendar.MONTH) + 1,
                                                 today.get(java.util.Calendar.DAY_OF_MONTH));
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend > '" + todayDate + "'");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend > '" + todayDate + "'");
 
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         ]]></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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,25 +26,25 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+            ((com.arsdigita.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/projects");
+        ((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/projects");
 
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,25 +26,25 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+            ((com.arsdigita.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/subDepartments");
+        ((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/subDepartments");
 
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,9 +5,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.london.navigation.cms.CMSDataCollectionDefinition"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <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();
@@ -22,47 +22,47 @@
                  title="Navigation" cache="false">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.GreetingItem"/>
         <define:component name="sectionXML"
                           classname="com.arsdigita.cms.contenttypes.ui.SciMemberDemoPanel"/>
 
         <jsp:scriptlet>
-        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
+        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.navigation.ui.GreetingItem) greetingItem).getObject();
         ((com.arsdigita.cms.contenttypes.ui.SciMemberDemoPanel) sectionXML).setContentItem(item);       
         </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="itemList"
-                          classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
+                          classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
 
         <jsp:scriptlet>
       ((com.arsdigita.cms.contenttypes.ui.SciMemberDemoPanel)sectionXML).setPageSize(20);
 
-      ((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.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.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.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.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");
+      ((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.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
     <show:all/>

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

@@ -5,9 +5,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.london.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+  <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();
@@ -22,44 +22,44 @@
     title="Navigation" cache="false">
 
     <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+      classname="com.arsdigita.navigation.ui.GreetingItem"/>
     <define:component name="sectionXML"
       classname="com.arsdigita.cms.contenttypes.ui.SciOrganizationWithPublicationsPanel"/>
     <jsp:scriptlet>
-        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
+        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.navigation.ui.GreetingItem) greetingItem).getObject();
         ((com.arsdigita.cms.contenttypes.ui.SciOrganizationPanel) sectionXML).setContentItem(item);
     </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="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
+      classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
     <jsp:scriptlet>
       ((com.arsdigita.cms.contenttypes.ui.SciOrganizationPanel)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.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.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.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.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");
+      ((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.london.navigation.ui.CategoryIndexAssignedTerms"/>
+         classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
   </define:page>
   <show:all/>

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,29 +26,29 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+            ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
                              SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((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).getTraversalAdapter().addAssociationProperty("/object/departments/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.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/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.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,29 +26,29 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+            ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
                              SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((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).getTraversalAdapter().addAssociationProperty("/object/departments/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.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/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.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,25 +26,25 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+            ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
                              SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments");        
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments");        
 
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,21 +26,21 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+            ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
                              SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();        
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();        
         </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,32 +26,32 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet><![CDATA[
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+            ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
                              SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
 
         java.util.Calendar today = new java.util.GregorianCalendar();
         String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
                                                 today.get(java.util.Calendar.MONTH) + 1,
                                                 today.get(java.util.Calendar.DAY_OF_MONTH));
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend <= '" + todayDate + "'");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend <= '" + todayDate + "'");
 
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         ]]></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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,28 +26,28 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+            ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
                              SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((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).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember = true");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember = true");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
 
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,27 +26,27 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+            ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
                              SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((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).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
 
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,32 +26,32 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet><![CDATA[
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+            ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
                              SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
         
         java.util.Calendar today = new java.util.GregorianCalendar();
         String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
                                                 today.get(java.util.Calendar.MONTH) + 1,
                                                 today.get(java.util.Calendar.DAY_OF_MONTH));
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend > '" + todayDate + "'");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend > '" + todayDate + "'");
 
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         ]]></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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -5,11 +5,11 @@
 
     <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.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"/>
 
 
@@ -26,27 +26,27 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+            ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
                              SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
 
 
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
         </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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 

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

@@ -6,11 +6,11 @@
 
     <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.ui.object.CustomizableObjectList"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.ui.object.CompareFilter"/>
+    <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="com.arsdigita.navigation.ui.object.CustomizableObjectList"/>
+    <jsp:directive.page import="com.arsdigita.navigation.ui.object.CompareFilter"/>
 
     <jsp:scriptlet>
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
@@ -24,13 +24,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;
@@ -59,7 +59,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/bundles/local/zes-std/templates/ccm-navigation/navigation/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/doc/app-schemas/app-schemas.html

@@ -120,7 +120,7 @@ etc.
       </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>
 
@@ -139,7 +139,7 @@ etc.
       </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>
 
@@ -158,7 +158,7 @@ etc.
       </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>
 
@@ -176,7 +176,7 @@ etc.
       </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>
 
@@ -195,7 +195,7 @@ etc.
       </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>
 
@@ -216,7 +216,7 @@ etc.
       </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>
 
@@ -235,7 +235,7 @@ etc.
       </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>
 
@@ -298,7 +298,7 @@ contains a summary of top two levels of navigation categories.
       </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-sci-bundle/doc/app-schemas/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-sci-bundle/doc/app-schemas/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-sci-bundle/web/packages/content-section/www/person4homepages.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.london.navigation.cms.CMSDataCollectionDefinition"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <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();
@@ -25,20 +25,20 @@
                  cache="false">
 
         <define:component name="personList"
-                          classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
+                          classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
         <jsp:scriptlet>
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).setDefinition(new CMSDataCollectionDefinition());
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).setRenderer(new CMSDataCollectionRenderer());
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.GenericPerson");
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getRenderer().setSpecializeObjects(true);
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setDescendCategories(true);
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setExcludeIndexObjects(false);
-	((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getDefinition().setFilterCategory(false);
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).getRenderer().setPageSize(99999);
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).setDefinition(new CMSDataCollectionDefinition());
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).setRenderer(new CMSDataCollectionRenderer());
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.GenericPerson");
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).getRenderer().setSpecializeObjects(true);
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).getDefinition().setDescendCategories(true);
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).getDefinition().setExcludeIndexObjects(false);
+	((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).getDefinition().setFilterCategory(false);
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).getRenderer().setPageSize(99999);
         if((request.getParameterMap().get("DaBInId") != null) &amp;&amp; (((String[])request.getParameterMap().get("DaBInId")).length &gt; 0)) {
           String[] params = (String[]) request.getParameterMap().get("DaBInId");
           String dabinid = params[0];
-          ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) personList).setSQLFilter(String.format("pageDescription LIKE '%%DaBInId={%s}%%'", dabinid));
+          ((com.arsdigita.navigation.ui.object.ComplexObjectList) personList).setSQLFilter(String.format("pageDescription LIKE '%%DaBInId={%s}%%'", dabinid));
         }
 
         </jsp:scriptlet>

ccm-sci-bundle/web/packages/content-section/www/projects4homepages.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.london.navigation.cms.CMSDataCollectionDefinition"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <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();
@@ -25,25 +25,25 @@
                  cache="false">
 
         <define:component name="projectList"
-                          classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
+                          classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
         <jsp:scriptlet>
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).setDefinition(new CMSDataCollectionDefinition());
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).setRenderer(new CMSDataCollectionRenderer());
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.SciProject");
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setSpecializeObjects(true);
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setDescendCategories(true);
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setExcludeIndexObjects(false);
-	((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setFilterCategory(false);
-	((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setAddOrder("title");
-      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setSpecializeObjectsContext("sciProjectList");
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).setDefinition(new CMSDataCollectionDefinition());
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).setRenderer(new CMSDataCollectionRenderer());
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.SciProject");
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setSpecializeObjects(true);
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setDescendCategories(true);
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setExcludeIndexObjects(false);
+	((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setFilterCategory(false);
+	((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getDefinition().setAddOrder("title");
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setSpecializeObjectsContext("sciProjectList");
         if((request.getParameterMap().get("DaBInId") != null) &amp;&amp; (((String[])request.getParameterMap().get("DaBInId")).length &gt; 0)) {
           String[] params = (String[]) request.getParameterMap().get("DaBInId");
           String dabinid = params[0];
-          ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).setSQLFilter(String.format("persons.pageDescription LIKE '%%DaBInId={%s}%%'", dabinid));
+          ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).setSQLFilter(String.format("persons.pageDescription LIKE '%%DaBInId={%s}%%'", dabinid));
 
         }
 
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setPageSize(99999);
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) projectList).getRenderer().setPageSize(99999);
         </jsp:scriptlet>
     </define:page>
 

ccm-sci-bundle/web/packages/content-section/www/publications4homepages.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.london.navigation.cms.CMSDataCollectionDefinition"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <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();
@@ -25,24 +25,24 @@
                  cache="false">
 
         <define:component name="publicationList"
-                          classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
+                          classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
         <jsp:scriptlet>
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).setDefinition(new CMSDataCollectionDefinition());
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).setRenderer(new CMSDataCollectionRenderer());
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Publication");
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getRenderer().setSpecializeObjects(true);
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setDescendCategories(true);        
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setExcludeIndexObjects(false);
-	((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setFilterCategory(false);
-	((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().addOrder("yearOfPublication desc");
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).setDefinition(new CMSDataCollectionDefinition());
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).setRenderer(new CMSDataCollectionRenderer());
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Publication");
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getRenderer().setSpecializeObjects(true);
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setDescendCategories(true);        
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setExcludeIndexObjects(false);
+	((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().setFilterCategory(false);
+	((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getDefinition().addOrder("yearOfPublication desc");
         if((request.getParameterMap().get("DaBInId") != null) &amp;&amp; (((String[])request.getParameterMap().get("DaBInId")).length &gt; 0)) {
           String[] params = (String[]) request.getParameterMap().get("DaBInId");
           String dabinid = params[0];          
-          ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).setSQLFilter(String.format("authors.pageDescription LIKE '%%DaBInId={%s}%%'", dabinid));
+          ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).setSQLFilter(String.format("authors.pageDescription LIKE '%%DaBInId={%s}%%'", dabinid));
           
         } 
 
-        ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) publicationList).getRenderer().setPageSize(99999);
+        ((com.arsdigita.navigation.ui.object.ComplexObjectList) publicationList).getRenderer().setPageSize(99999);
         </jsp:scriptlet>
     </define:page>
 

ccm-sci-bundle/web/templates/ccm-navigation/services/summary.jsp

@@ -13,9 +13,9 @@
     title="APLAWS" 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="itemSummary"
       classname="com.arsdigita.aplaws.ui.TermItemSummary"/>
 

ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciorganization-with-publications-item.jsp

@@ -4,8 +4,8 @@
           version="1.2">
 
     <jsp:directive.page
-        import="com.arsdigita.london.navigation.NavigationModel,
-        com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+        import="com.arsdigita.navigation.NavigationModel,
+        com.arsdigita.navigation.cms.CMSNavigationModel"/>
 
     <jsp:declaration>
     NavigationModel model = new CMSNavigationModel();
@@ -15,15 +15,15 @@
                  title="APLAWS" cache="false">
 
         <define:component name="categoryPath"
-                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+                          classname="com.arsdigita.navigation.ui.category.Path"/>
         <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Path)categoryPath)
+       ((com.arsdigita.navigation.ui.category.Path)categoryPath)
          .setModel(model);
         </jsp:scriptlet>
         <define:component name="categoryMenu"
-                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+                          classname="com.arsdigita.navigation.ui.category.Menu"/>
         <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu)
+       ((com.arsdigita.navigation.ui.category.Menu)categoryMenu)
          .setModel(model);
         </jsp:scriptlet>
         <define:component name="itemXML"
@@ -32,7 +32,7 @@
                           classname="com.arsdigita.cms.contenttypes.ui.SciOrganizationWithPublicationsPanel"/>
 
         <define:component name="relatedItems"
-                          classname="com.arsdigita.london.navigation.ui.RelatedItems"/>
+                          classname="com.arsdigita.navigation.ui.RelatedItems"/>
 
         <define:component name="assignedTerms"
                           classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>

ccm-webpage/web/packages/content-section/templates/default/practice-news-folder.jsp

@@ -6,32 +6,32 @@
 
   <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"/>
 
   <define:page name="itemPage" application="navigation"
     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.CategoryPath"/>
+      classname="com.arsdigita.navigation.ui.CategoryPath"/>
     <define:component name="categoryNavRecursive"
-      classname="com.arsdigita.london.navigation.ui.CategoryNavRecursive"/>
+      classname="com.arsdigita.navigation.ui.CategoryNavRecursive"/>
     <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.ItemList"/>
+      classname="com.arsdigita.navigation.ui.ItemList"/>
     <define:component name="contentSectionComponent"
       classname="com.arsdigita.cms.ui.ContentSectionComponent"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.ItemList) itemList).setObjectType( "com.arsdigita.cms.ContentBundle" );
-      ((com.arsdigita.london.navigation.ui.ItemList) itemList).setHowMany(99);
-      ((com.arsdigita.london.navigation.ui.ItemList) itemList).setDescendCategories(true);      
-      ((com.arsdigita.london.navigation.ui.ItemList) itemList).addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.ItemList) itemList).addAttribute( "title" );
-      ((com.arsdigita.london.navigation.ui.ItemList) itemList).addAttribute( "description" );
-      <!--((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).addAttribute( "body" );-->
-      ((com.arsdigita.london.navigation.ui.ItemList) itemList).addAttribute( "lead" );
-      ((com.arsdigita.london.navigation.ui.ItemList) itemList).addAttribute( "lastModifiedDate" );
-      ((com.arsdigita.london.navigation.ui.ItemList) itemList).includeImages(4);
+      ((com.arsdigita.navigation.ui.ItemList) itemList).setObjectType( "com.arsdigita.cms.ContentBundle" );
+      ((com.arsdigita.navigation.ui.ItemList) itemList).setHowMany(99);
+      ((com.arsdigita.navigation.ui.ItemList) itemList).setDescendCategories(true);      
+      ((com.arsdigita.navigation.ui.ItemList) itemList).addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.ItemList) itemList).addAttribute( "title" );
+      ((com.arsdigita.navigation.ui.ItemList) itemList).addAttribute( "description" );
+      <!--((com.arsdigita.navigation.ui.GreetingItem) greetingItem).addAttribute( "body" );-->
+      ((com.arsdigita.navigation.ui.ItemList) itemList).addAttribute( "lead" );
+      ((com.arsdigita.navigation.ui.ItemList) itemList).addAttribute( "lastModifiedDate" );
+      ((com.arsdigita.navigation.ui.ItemList) itemList).includeImages(4);
     </jsp:scriptlet>
   </define:page>
 

ccm-webpage/web/packages/content-section/templates/default/practice-news-item.jsp

@@ -6,20 +6,20 @@
 
   <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"/>
 
   <define:page name="itemPage" application="navigation"
     title="Navigation" cache="true">
 
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.CategoryPath"/>
+      classname="com.arsdigita.navigation.ui.CategoryPath"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.CategoryPath) categoryPath).setSelectionType( com.arsdigita.london.navigation.ui.Selection.USE_ITEM_ID );
+      ((com.arsdigita.navigation.ui.CategoryPath) categoryPath).setSelectionType( com.arsdigita.navigation.ui.Selection.USE_ITEM_ID );
     </jsp:scriptlet>
     <define:component name="categoryNavRecursive"
-      classname="com.arsdigita.london.navigation.ui.CategoryNavRecursive"/>
+      classname="com.arsdigita.navigation.ui.CategoryNavRecursive"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.CategoryNavRecursive) categoryNavRecursive).setSelectionType( com.arsdigita.london.navigation.ui.Selection.USE_ITEM_ID );
+      ((com.arsdigita.navigation.ui.CategoryNavRecursive) categoryNavRecursive).setSelectionType( com.arsdigita.navigation.ui.Selection.USE_ITEM_ID );
     </jsp:scriptlet>
     <define:component name="contentPanel"
       classname="com.arsdigita.cms.webpage.ui.ContentPanelWebpageNode"/>

ccm-webpage/web/static/content-types/com/arsdigita/cms/Webpage.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"
                 xmlns:webpage="http://www.undp.org/webpage/1.0"
                 version="1.0">