Anpassen uder Standard Packages an Änderungen im build script und ccm-navigation

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

ccm-cms-assets-imagestep/application.xml

@@ -8,7 +8,7 @@
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-ldn-navigation" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-navigation" version="6.6.0" relation="ge"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/imagestep/ImagePropertyRenderer.java

@@ -18,7 +18,7 @@
 
 package com.arsdigita.cms.contentassets.imagestep;
 
-import com.arsdigita.london.navigation.DataCollectionPropertyRenderer;
+import com.arsdigita.navigation.DataCollectionPropertyRenderer;
 
 import com.arsdigita.cms.ReusableImageAsset;
 import com.arsdigita.cms.contentassets.ItemImageAttachment;

ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/imagestep/SingleImageProperty.java

@@ -18,7 +18,7 @@
 
 package com.arsdigita.cms.contentassets.imagestep;
 
-import com.arsdigita.london.navigation.DataCollectionProperty;
+import com.arsdigita.navigation.DataCollectionProperty;
 
 import com.arsdigita.persistence.CompoundFilter;
 import com.arsdigita.persistence.DataCollection;

ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java

@@ -1,9 +1,27 @@
+/*
+ * Copyright (C) 2011-2004 Jens Pelzetter All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
 package com.arsdigita.cms.contenttypes;
 
-import com.arsdigita.cms.CMS;
+// import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.contentassets.RelatedLink;
 import com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfiles;
-import com.arsdigita.dispatcher.DispatcherHelper;
+// import com.arsdigita.dispatcher.DispatcherHelper;
 import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.globalization.GlobalizationHelper;
 import com.arsdigita.persistence.DataCollection;
@@ -52,12 +70,12 @@ public class PublicPersonalProfileXmlUtil {
 
         Element navRoot =
                 root.newChildElement("nav:categoryMenu",
-                "http://ccm.redhat.com/london/navigation");
+                "http://ccm.redhat.com/navigation");
         navRoot.addAttribute("id", "categoryMenu");
 
         Element navList =
                 navRoot.newChildElement("nav:category",
-                "http://ccm.redhat.com/london/navigation");
+                "http://ccm.redhat.com/navigation");
         navList.addAttribute("AbstractTree", "AbstractTree");
         navList.addAttribute("description", "");
         navList.addAttribute("id", "");
@@ -74,7 +92,7 @@ public class PublicPersonalProfileXmlUtil {
         if (config.getShowHomeNavEntry()) {
             Element navHome =
                     navList.newChildElement("nav:category",
-                    "http://ccm.redhat.com/london/navigation");
+                    "http://ccm.redhat.com/navigation");
             navHome.addAttribute("AbstractTree", "AbstractTree");
             navHome.addAttribute("description", "");
             navHome.addAttribute("id", profile.getID().toString());
@@ -113,10 +131,10 @@ public class PublicPersonalProfileXmlUtil {
 
         final Element pathElem =
                 root.newChildElement("nav:categoryPath",
-                "http://ccm.redhat.com/london/navigation");
+                "http://ccm.redhat.com/navigation");
         final Element homeElem =
                 pathElem.newChildElement("nav:category",
-                "http://ccm.redhat.com/london/navigation");
+                "http://ccm.redhat.com/navigation");
         //homeElem.addAttribute("url", String.format("%s/%s",
         //                                         appUrl,
         //                                       profile.getProfileUrl()));
@@ -124,7 +142,7 @@ public class PublicPersonalProfileXmlUtil {
                 UI.getConfig().getRootPage()));
 
         final Element profileElem = pathElem.newChildElement("nav:category",
-                "http://ccm.redhat.com/london/navigation");
+                "http://ccm.redhat.com/navigation");
         profileElem.addAttribute("url", String.format("%s/%s",
                 appUrl,
                 profile.getProfileUrl()));
@@ -150,7 +168,7 @@ public class PublicPersonalProfileXmlUtil {
 
             navElem =
                     navList.newChildElement("nav:category",
-                    "http://ccm.redhat.com/london/navigation");
+                    "http://ccm.redhat.com/navigation");
             navElem.addAttribute("AbstractTree", "AbstractTree");
             navElem.addAttribute("description", "");
             //navHome.addAttribute("id", "");
@@ -158,7 +176,7 @@ public class PublicPersonalProfileXmlUtil {
                 navElem.addAttribute("isSelected", "true");
                 final Element currentPathElem =
                         pathElem.newChildElement("nav:category",
-                        "http://ccm.redhat.com/london/navigation");
+                        "http://ccm.redhat.com/navigation");
                 currentPathElem.addAttribute("title", navItem.getLabel());
                 currentPathElem.addAttribute("url",
                         String.format("%s/%s/%s",

ccm-cms-types-siteproxy/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/siteproxy-item.jsp.noLongerInUse

@@ -1,34 +0,0 @@
-<%-- 
-    Document   : siteproxy-item2
-    Created on : 15.11.2009, 17:38:26
-    Author     : pb
---%>
-
-<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">
-
-  <%-- Extension to include the navigation menue on the siteproxy page 
-  --%>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-
-  <define:page name="SiteProxyItemPage" application="content" 
-    title="CMS" cache="true">
-
-  <%-- Extension to include the navigation menue on the siteproxy page 
-  --%>
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-  <%-- End of navigation extension   --%>
-
-    <define:component name="itemXML"
-      classname="com.arsdigita.cms.dispatcher.ContentPanel"/>
-    <define:component name="siteProxyItemXML"
-      classname="com.arsdigita.cms.dispatcher.SiteProxyPanel"/>
-  </define:page>
-
-  <show:all/>
-</jsp:root>

ccm-cms/src/com/arsdigita/cms/CustomizableContentItemXMLRenderer.java

@@ -19,7 +19,7 @@
  */
 package com.arsdigita.cms;
 
-import com.arsdigita.dispatcher.DispatcherHelper;
+// import com.arsdigita.dispatcher.DispatcherHelper;
 import com.arsdigita.domain.DomainObject;
 import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.domain.DomainObjectTraversalAdapter;
@@ -247,7 +247,7 @@ public class CustomizableContentItemXMLRenderer
             "nav:paginator");*/
             Element paginator =
                     new Element("nav:paginator",
-                                "http://ccm.redhat.com/london/navigation");
+                                "http://ccm.redhat.com/navigation");
             getCurrentElement().addContent(paginator);
 
             ParameterMap map = new ParameterMap();

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/CompoundContentItemPanel.java

@@ -217,7 +217,7 @@ public abstract class CompoundContentItemPanel
         Element paginator;
         paginator =
         parent.newChildElement("nav:paginator",
-                               "http://ccm.redhat.com/london/navigation");
+                               "http://ccm.redhat.com/navigation");
 
         URL requestURL = Web.getContext().getRequestURL();
 

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrgaUnitPaginator.java

@@ -47,7 +47,7 @@ public class GenericOrgaUnitPaginator<T extends DataQuery> {
     public void generateXml(final Element parent) {
         final Element paginatorElem = parent.newChildElement(
                 "nav:paginator",
-                "http://ccm.redhat.com/london/navigation");
+                "http://ccm.redhat.com/navigation");
 
         final URL requestUrl = Web.getContext().getRequestURL();
         final ParameterMap parameters = new ParameterMap();

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java

@@ -51,7 +51,7 @@ public class Paginator {
 
     public void generateXml(final Element parent) {
         final Element paginatorElem = parent.newChildElement(
-                "nav:paginator", "http://ccm.redhat.com/london/navigation");
+                "nav:paginator", "http://ccm.redhat.com/navigation");
 
         final URL requestUrl = Web.getContext().getRequestURL();
 

ccm-core/src/log4j.properties

@@ -105,6 +105,9 @@ log4j.logger.com.arsdigita.packaging.Loader=INFO
 #com.arsdigita.developersupport.#Comodifications=DEBUG
 #com.arsdigita.developersupport.Counter=DEBUG
 #com.arsdigita.developersupport.LoggingProxyFactory=DEBUG
+#com.arsdigita.navigation.ui.TemplateURLs=DEBUG
+#com.arsdigita.navigation.Navigation=DEBUG
+#com.arsdigita.navigation.ApplicationNavigationModel=DEBUG
 #com.arsdigita.persistence.pdl.PDL=DEBUG
 #com.arsdigita.persistence.pdl.SQLRegressionGenerator=DEBUG
 #com.arsdigita.persistence.SessionManager=DEBUG
@@ -158,13 +161,6 @@ log4j.logger.com.arsdigita.packaging.Loader=INFO
 #com.arsdigita.london.cms.dublin.DublinCoreItem=DEBUG
 #com.arsdigita.london.exporter.Exporter=DEBUG
 #com.arsdigita.london.importer.cms.ItemParser=DEBUG
-#com.arsdigita.london.navigation.ui.TemplateURLs=DEBUG
-#com.arsdigita.london.navigation.Navigation=DEBUG
-#com.arsdigita.london.navigation.ApplicationNavigationModel=DEBUG
-#com.arsdigita.london.portal.portlet.RSSFeedPortletHelper=DEBUG
-#com.arsdigita.london.portal.ui.admin.GrantsTable=DEBUG
-#com.arsdigita.london.portal.ui.Icons=DEBUG
-#com.arsdigita.london.Workspace=DEBUG
 #com.arsdigita.london.rss.RSS=DEBUG
 #com.arsdigita.london.rss.RSSService=DEBUG
 #com.arsdigita.london.search.Search=DEBUG

ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/BrowseCatDocsPane.java

@@ -58,8 +58,8 @@ import com.arsdigita.cms.ContentSectionCollection;
 import com.arsdigita.cms.docmgr.DocMgr;
 import com.arsdigita.globalization.GlobalizedMessage;
 import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
-import com.arsdigita.london.navigation.ui.admin.CategorySelectionModel;
+import com.arsdigita.navigation.ui.admin.CategorySelectionModel;
-import com.arsdigita.london.navigation.ui.admin.CategoryTree;
+import com.arsdigita.navigation.ui.admin.CategoryTree;
 import com.arsdigita.xml.Element;
 
 /**

ccm-forum-categorised/application.xml

@@ -9,7 +9,7 @@
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-forum" version="6.4.0" relation="ge"/>
-    <ccm:requires name="ccm-ldn-navigation" version="6.4.0" relation="ge"/>
+    <ccm:requires name="ccm-navigation" version="6.4.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-terms" version="6.4.0" relation="ge"/>
 <!--    <ccm:requires name="ccm-ldn-aplaws" version="6.4.0" relation="ge"/>
     <ccm:requires name="ccm-gen-aplaws" version="6.4.0" relation="ge"/>  -->

ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorisedForumPageBuilder.java

@@ -13,8 +13,8 @@ import com.arsdigita.forum.ForumContext;
 import com.arsdigita.forum.ForumPageBuilder;
 import com.arsdigita.forum.ui.ForumUserCompactView;
 import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.london.navigation.ui.category.Menu;
+import com.arsdigita.navigation.ui.category.Menu;
-import com.arsdigita.london.navigation.ui.category.Path;
+import com.arsdigita.navigation.ui.category.Path;
 
 /**
  * @author cgyg9330

ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorisedThreadPageBuilder.java

@@ -10,8 +10,8 @@ import com.arsdigita.bebop.Page;
 import com.arsdigita.bebop.parameters.ParameterModel;
 import com.arsdigita.forum.ForumPageBuilder;
 import com.arsdigita.forum.ThreadPageBuilder;
-import com.arsdigita.london.navigation.ui.category.Menu;
+import com.arsdigita.navigation.ui.category.Menu;
-import com.arsdigita.london.navigation.ui.category.Path;
+import com.arsdigita.navigation.ui.category.Path;
 
 /**
  * @author cgyg9330

ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorySubtreePageBuilder.java

@@ -7,13 +7,8 @@
 package com.arsdigita.forum.categorised;
 
 import com.arsdigita.bebop.Page;
-// import com.arsdigita.bebop.parameters.ParameterModel;
 import com.arsdigita.cms.ui.authoring.EmptyPage;
-// import com.arsdigita.forum.ForumPageBuilder;
 import com.arsdigita.forum.PageBuilder;
-// import com.arsdigita.forum.ThreadPageBuilder;
-// import com.arsdigita.london.navigation.ui.category.Menu;
-// import com.arsdigita.london.navigation.ui.category.Path;
 import com.arsdigita.london.terms.ui.CategorySubtree;
 
 /**

ccm-forum-categorised/src/com/arsdigita/forum/categorised/ForumNavigationModel.java

@@ -30,8 +30,8 @@ import com.arsdigita.categorization.CategoryCollection;
 import com.arsdigita.domain.DomainCollection;
 import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.kernel.Kernel;
-import com.arsdigita.london.navigation.CookieNavigationModel;
+import com.arsdigita.navigation.CookieNavigationModel;
-import com.arsdigita.london.navigation.GenericNavigationModel;
+import com.arsdigita.navigation.GenericNavigationModel;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.london.terms.Term;
 import com.arsdigita.london.terms.Util;

ccm-forum-categorised/web/__ccm__/apps/categorised-forum/xsl/forum-categories.xsl

@@ -1,7 +1,7 @@
 ll<xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
 				xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
 				xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-				xmlns:nav="http://ccm.redhat.com/london/navigation" 
+				xmlns:nav="http://ccm.redhat.com/navigation" 
 				xmlns:search="http://rhea.redhat.com/search/1.0" 
 				xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" 				
 				xmlns:cms="http://www.arsdigita.com/cms/1.0" 	

ccm-forum/src/com/arsdigita/forum/ui/ForumResources_de.properties

@@ -16,10 +16,10 @@ forum.ui.save=Speichern
 forum.ui.yes=Ja
 forum.ui.no=Nein
 
-forum.ui.thread.newPost=Neues Diskussionsthema er\u00f6ffnen
+forum.ui.thread.newPost=Neuer Beitrag
-forum.ui.thread.subscribe=Thema abonnieren
+forum.ui.thread.subscribe=Beitrag abonnieren
-forum.ui.thread.unsubscribe=Thema stornieren
+forum.ui.thread.unsubscribe=Beitrag Abonoment stornieren
-forum.ui.thread.viewAll=Alle Themen
+forum.ui.thread.viewAll=Alle Beitr\u00e4ge
 
 forum.ui.topic.description=Beschreibung
 forum.ui.topic.name=Name

ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java

@@ -23,7 +23,7 @@ import org.apache.log4j.Logger;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.cms.ContentType;
 import com.arsdigita.domain.DomainCollection;
-import com.arsdigita.london.navigation.DataCollectionDefinition;
+import com.arsdigita.navigation.DataCollectionDefinition;
 import com.arsdigita.london.subsite.Site;
 import com.arsdigita.london.subsite.Subsite;
 import com.arsdigita.london.subsite.SubsiteContext;

ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java

@@ -32,8 +32,8 @@ import com.arsdigita.london.atoz.ui.admin.SiteProxyProviderAdmin;
 import com.arsdigita.london.atoz.ui.admin.SiteProxyProviderForm;
 import com.arsdigita.london.atoz.ui.terms.DomainProviderAdmin;
 import com.arsdigita.london.atoz.ui.terms.DomainProviderForm;
-import com.arsdigita.london.navigation.ApplicationNavigationModel;
+import com.arsdigita.navigation.ApplicationNavigationModel;
-import com.arsdigita.london.navigation.DefaultNavigationModel;
+import com.arsdigita.navigation.DefaultNavigationModel;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.pdl.ManifestSource;
 import com.arsdigita.persistence.pdl.NameFilter;

ccm-ldn-dublin/src/com/arsdigita/london/cms/dublin/RelatedItemsQueryFactoryImpl.java

@@ -19,8 +19,8 @@
 
 package com.arsdigita.london.cms.dublin;
 
-import com.arsdigita.london.navigation.RelatedItemsQuery;
+import com.arsdigita.navigation.RelatedItemsQuery;
-import com.arsdigita.london.navigation.RelatedItemsQueryFactory;
+import com.arsdigita.navigation.RelatedItemsQueryFactory;
 import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentPage;
 import com.arsdigita.util.StringUtils;

ccm-ldn-dublin/src/com/arsdigita/london/cms/dublin/RelatedItemsQueryImpl.java

@@ -19,7 +19,7 @@
 
 package com.arsdigita.london.cms.dublin;
 
-import com.arsdigita.london.navigation.RelatedItemsQuery;
+import com.arsdigita.navigation.RelatedItemsQuery;
 import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentPage;
 import com.arsdigita.categorization.Category;

ccm-ldn-dublin/test/src/com/arsdigita/london/cms/dublin/DublinTestSetup.java

@@ -43,7 +43,7 @@ public class DublinTestSetup extends CoreTestSetup {
         addRequiredInitializer("com.arsdigita.london.util.Initializer");
         addRequiredInitializer("com.arsdigita.london.atoz.Initializer");
         addRequiredInitializer("com.arsdigita.london.terms.Initializer");
-        addRequiredInitializer("com.arsdigita.london.navigation.Initializer");
+        addRequiredInitializer("com.arsdigita.navigation.Initializer");
         addRequiredInitializer("com.arsdigita.london.cms.dublin.Initializer");
         super.setUp();
     }

ccm-ldn-search/web/templates/ccm-ldn-search/advanced.jsp

@@ -4,7 +4,7 @@
           version="1.2">
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
   <jsp:directive.page import="com.arsdigita.toolbox.ui.ApplicationAuthenticationListener"/>
 
   <jsp:scriptlet>
@@ -14,9 +14,9 @@
   <define:page name="advanced" application="search" 
     title="Search" 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="search" classname="com.arsdigita.london.search.ui.AdvancedSearchPane"/>
   </define:page>
 

ccm-ldn-search/web/templates/ccm-ldn-search/index.jsp

@@ -4,7 +4,7 @@
           version="1.2">
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
   <jsp:directive.page import="com.arsdigita.toolbox.ui.ApplicationAuthenticationListener"/>
 
   <jsp:scriptlet>
@@ -14,9 +14,9 @@
   <define:page name="search" application="search" 
     title="Search" 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="simpleSearch" classname="com.arsdigita.london.search.ui.SimpleSearchPane"/>
   </define:page>
 

ccm-ldn-search/web/templates/ccm-ldn-search/remote.jsp

@@ -4,7 +4,7 @@
           version="1.2">
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
   <jsp:directive.page import="com.arsdigita.toolbox.ui.ApplicationAuthenticationListener"/>
 
   <jsp:scriptlet>
@@ -14,9 +14,9 @@
   <define:page name="remote" application="search" 
     title="Remote Search" 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="search" classname="com.arsdigita.london.search.ui.RemoteSearchPane"/>
   </define:page>
 

ccm-ldn-subsite/application.xml

@@ -9,7 +9,7 @@
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-util" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-ldn-navigation" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-navigation" version="6.6.0" relation="ge"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

ccm-ldn-subsite/src/ccm-ldn-subsite.load

@@ -6,7 +6,7 @@
     <table name="cms_items"/>
     <initializer class="com.arsdigita.cms.Initializer"/>
     <initializer class="com.arsdigita.london.util.Initializer"/>
-    <initializer class="com.arsdigita.london.navigation.Initializer"/>
+    <initializer class="com.arsdigita.navigation.Initializer"/>
   </requires>
   <provides>
   <!--

ccm-ldn-subsite/src/com/arsdigita/london/subsite/SubsiteFilter.java

@@ -31,7 +31,7 @@ import java.io.IOException;
 import com.arsdigita.web.BaseFilter;
 import com.arsdigita.web.URL;
 import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.london.navigation.NavigationContext;
+import com.arsdigita.navigation.NavigationContext;
 
 import org.apache.log4j.Logger;
 

ccm-portalworkspace/src/ccm-portalworkspace.load

@@ -7,7 +7,7 @@
     <initializer class="com.arsdigita.cms.Initializer"/>
     <initializer class="com.arsdigita.london.util.Initializer"/>
 
-<!-- <initializer class="com.arsdigita.london.navigation.Initializer"/> -->
+<!-- <initializer class="com.arsdigita.navigation.Initializer"/> -->
 <!-- <initializer class="com.arsdigita.london.rss.Initializer"/>  -->
   </requires>
   <provides>

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

@@ -300,10 +300,10 @@ public class Initializer extends CompoundInitializer {
 
         FlashPortletInitializer.initialize();
 
-        // import from london.navigation required 
+        // import from navigation required 
         // causes horizontal dependency between portal and navigation
         // required by NavigationTreePortlet (formerly NavigationDirectroryPortlet)
-        // now moved to ldn-navigation ??
+        // now moved to navigation ??
 //      ApplicationNavigationModel.register(Workspace.class.getName(),
 //			            new DefaultNavigationModel());
     }

ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java

@@ -114,7 +114,31 @@ public class Workspace extends Application {
      */
 
     /**
+     * Returns the path name of the location of the applications servlet/JSP.
      *
+     * The method overwrites the super class to provide an application specific
+     * location for servlets/JSP. This is necessary if you whish to install the
+     * module (application) along with others in one context. If you install the
+     * module into its own context (no longer recommended for versions newer
+     * than 1.0.4) you may use a standard location.
+     *
+     * Usually it is a symbolic name/path, which will be mapped in the web.xml
+     * to the real location in the file system. Example:
+     * <servlet>
+     *   <servlet-name>portalworkspace-files</servlet-name>
+     *   <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+     *   <init-param>
+     *     <param-name>template-path</param-name>
+     *     <param-value>/templates/ccm-portalworkspace</param-value>
+     *   </init-param>
+     * </servlet>
+     *
+     * <servlet-mapping>
+     *   <servlet-name>portalworkspace-files</servlet-name>
+     *   <url-pattern>/ccm-portalworkspace/files/*</url-pattern>
+     * </servlet-mapping>
+     *
+     * @return path name to the applications servlet/JSP
      * @return ServletPath (constant) probably should be synchron with web.xml
      *                     entry
      */

ccm-portalworkspace/src/com/arsdigita/portalworkspace/upgrade/CreateNavigationDirectoryPortlet.java

@@ -2,7 +2,7 @@ package com.arsdigita.portalworkspace.upgrade;
 
 import org.apache.commons.cli.CommandLine;
 
-import com.arsdigita.london.navigation.portlet.NavigationTreePortlet;
+import com.arsdigita.navigation.portlet.NavigationTreePortlet;
 import com.arsdigita.london.util.Transaction;
 import com.arsdigita.packaging.Program;
 

ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirector.java

@@ -95,20 +95,20 @@ public class ThemeDirector extends Application {
      *   <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
      *   <init-param>
      *     <param-name>template-path</param-name>
-     *     <param-value>/templates/ccm-ldn-theme</param-value>
+     *     <param-value>/templates/ccm-themedirector</param-value>
      *   </init-param>
      * </servlet>
      *
      * <servlet-mapping>
      *   <servlet-name>theme-files</servlet-name>
-     *   <url-pattern>/ccm-ldn-theme/files/*</url-pattern>
+     *   <url-pattern>/ccm-themedirector/files/*</url-pattern>
      * </servlet-mapping>
      *
      * @return path name to the applications servlet/JSP
      */
+    @Override
     public String getServletPath() {
-        // sufficient if executed in its own web application context (ccm-ldn-theme)
+        // return "/files";
         return "/theme-files";
-        // return "/ccm-ldn-theme/files";
     }
 }