diff --git a/ccm-cms-assets-imagestep/application.xml b/ccm-cms-assets-imagestep/application.xml index fc5e6552d..934b0cc34 100755 --- a/ccm-cms-assets-imagestep/application.xml +++ b/ccm-cms-assets-imagestep/application.xml @@ -8,7 +8,7 @@ - + diff --git a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/imagestep/ImagePropertyRenderer.java b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/imagestep/ImagePropertyRenderer.java index fbeadb3cc..d4b4bacbb 100755 --- a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/imagestep/ImagePropertyRenderer.java +++ b/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; diff --git a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/imagestep/SingleImageProperty.java b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/imagestep/SingleImageProperty.java index 9c9ccc604..17bab5661 100755 --- a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/imagestep/SingleImageProperty.java +++ b/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; diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java index e642055d3..1ca537ae9 100644 --- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java +++ b/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", diff --git a/ccm-cms-types-siteproxy/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/siteproxy-item.jsp.noLongerInUse b/ccm-cms-types-siteproxy/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/siteproxy-item.jsp.noLongerInUse deleted file mode 100755 index 080138dfe..000000000 --- a/ccm-cms-types-siteproxy/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/siteproxy-item.jsp.noLongerInUse +++ /dev/null @@ -1,34 +0,0 @@ -<%-- - Document : siteproxy-item2 - Created on : 15.11.2009, 17:38:26 - Author : pb ---%> - - - - <%-- Extension to include the navigation menue on the siteproxy page - --%> - - - - - <%-- Extension to include the navigation menue on the siteproxy page - --%> - - - <%-- End of navigation extension --%> - - - - - - - diff --git a/ccm-cms/src/com/arsdigita/cms/CustomizableContentItemXMLRenderer.java b/ccm-cms/src/com/arsdigita/cms/CustomizableContentItemXMLRenderer.java index d1fe35d0f..19fb0a11d 100644 --- a/ccm-cms/src/com/arsdigita/cms/CustomizableContentItemXMLRenderer.java +++ b/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(); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/CompoundContentItemPanel.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/CompoundContentItemPanel.java index b8d4f34d8..b82a46c14 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/CompoundContentItemPanel.java +++ b/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(); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrgaUnitPaginator.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrgaUnitPaginator.java index ae4350c15..fd9de2f7a 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrgaUnitPaginator.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrgaUnitPaginator.java @@ -47,7 +47,7 @@ public class GenericOrgaUnitPaginator { 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(); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java index 15eb7bde9..cae5b3a5d 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java +++ b/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(); diff --git a/ccm-core/src/log4j.properties b/ccm-core/src/log4j.properties index 05c91b5b7..585d642c2 100755 --- a/ccm-core/src/log4j.properties +++ b/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 diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/BrowseCatDocsPane.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/BrowseCatDocsPane.java index 27eda144d..2e4e70964 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/BrowseCatDocsPane.java +++ b/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.london.navigation.ui.admin.CategoryTree; +import com.arsdigita.navigation.ui.admin.CategorySelectionModel; +import com.arsdigita.navigation.ui.admin.CategoryTree; import com.arsdigita.xml.Element; /** diff --git a/ccm-forum-categorised/application.xml b/ccm-forum-categorised/application.xml index 428d42911..6b639b27f 100644 --- a/ccm-forum-categorised/application.xml +++ b/ccm-forum-categorised/application.xml @@ -9,7 +9,7 @@ - + diff --git a/ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorisedForumPageBuilder.java b/ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorisedForumPageBuilder.java index a8428eae0..052fa1220 100644 --- a/ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorisedForumPageBuilder.java +++ b/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.london.navigation.ui.category.Path; +import com.arsdigita.navigation.ui.category.Menu; +import com.arsdigita.navigation.ui.category.Path; /** * @author cgyg9330 diff --git a/ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorisedThreadPageBuilder.java b/ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorisedThreadPageBuilder.java index fbb943e39..d3a092c5f 100644 --- a/ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorisedThreadPageBuilder.java +++ b/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.london.navigation.ui.category.Path; +import com.arsdigita.navigation.ui.category.Menu; +import com.arsdigita.navigation.ui.category.Path; /** * @author cgyg9330 diff --git a/ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorySubtreePageBuilder.java b/ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorySubtreePageBuilder.java index 31f3c5111..aeedf2c4f 100644 --- a/ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorySubtreePageBuilder.java +++ b/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; /** diff --git a/ccm-forum-categorised/src/com/arsdigita/forum/categorised/ForumNavigationModel.java b/ccm-forum-categorised/src/com/arsdigita/forum/categorised/ForumNavigationModel.java index 23944bb6f..64886758e 100644 --- a/ccm-forum-categorised/src/com/arsdigita/forum/categorised/ForumNavigationModel.java +++ b/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.london.navigation.GenericNavigationModel; +import com.arsdigita.navigation.CookieNavigationModel; +import com.arsdigita.navigation.GenericNavigationModel; import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.Term; import com.arsdigita.london.terms.Util; diff --git a/ccm-forum-categorised/web/__ccm__/apps/categorised-forum/xsl/forum-categories.xsl b/ccm-forum-categorised/web/__ccm__/apps/categorised-forum/xsl/forum-categories.xsl index b97e993dc..26ba05ec8 100644 --- a/ccm-forum-categorised/web/__ccm__/apps/categorised-forum/xsl/forum-categories.xsl +++ b/ccm-forum-categorised/web/__ccm__/apps/categorised-forum/xsl/forum-categories.xsl @@ -1,7 +1,7 @@ ll - + @@ -14,9 +14,9 @@ + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> diff --git a/ccm-ldn-search/web/templates/ccm-ldn-search/index.jsp b/ccm-ldn-search/web/templates/ccm-ldn-search/index.jsp index a2a05e89f..82239318f 100755 --- a/ccm-ldn-search/web/templates/ccm-ldn-search/index.jsp +++ b/ccm-ldn-search/web/templates/ccm-ldn-search/index.jsp @@ -4,7 +4,7 @@ version="1.2"> - + @@ -14,9 +14,9 @@ + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> diff --git a/ccm-ldn-search/web/templates/ccm-ldn-search/remote.jsp b/ccm-ldn-search/web/templates/ccm-ldn-search/remote.jsp index 1a4ae7886..0bc831f91 100755 --- a/ccm-ldn-search/web/templates/ccm-ldn-search/remote.jsp +++ b/ccm-ldn-search/web/templates/ccm-ldn-search/remote.jsp @@ -4,7 +4,7 @@ version="1.2"> - + @@ -14,9 +14,9 @@ + classname="com.arsdigita.navigation.ui.category.Path"/> + classname="com.arsdigita.navigation.ui.category.Menu"/> diff --git a/ccm-ldn-subsite/application.xml b/ccm-ldn-subsite/application.xml index 11974dc55..f83b3155e 100755 --- a/ccm-ldn-subsite/application.xml +++ b/ccm-ldn-subsite/application.xml @@ -9,7 +9,7 @@ - + diff --git a/ccm-ldn-subsite/src/ccm-ldn-subsite.load b/ccm-ldn-subsite/src/ccm-ldn-subsite.load index 88de98fec..7c0f29a29 100755 --- a/ccm-ldn-subsite/src/ccm-ldn-subsite.load +++ b/ccm-ldn-subsite/src/ccm-ldn-subsite.load @@ -6,7 +6,7 @@ - + + diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Initializer.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Initializer.java index 6a5d54f42..3f65a3496 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Initializer.java +++ b/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()); } diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java index 7f95274dd..879a21ec4 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java +++ b/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: + * + * portalworkspace-files + * com.arsdigita.web.ApplicationFileServlet + * + * template-path + * /templates/ccm-portalworkspace + * + * + * + * + * portalworkspace-files + * /ccm-portalworkspace/files/* + * + * + * @return path name to the applications servlet/JSP * @return ServletPath (constant) probably should be synchron with web.xml * entry */ diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/upgrade/CreateNavigationDirectoryPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/upgrade/CreateNavigationDirectoryPortlet.java index ee74d5359..11290c3ed 100644 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/upgrade/CreateNavigationDirectoryPortlet.java +++ b/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; diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirector.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirector.java index b1108f0a7..bdbf32004 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirector.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirector.java @@ -95,20 +95,20 @@ public class ThemeDirector extends Application { * com.arsdigita.web.ApplicationFileServlet * * template-path - * /templates/ccm-ldn-theme + * /templates/ccm-themedirector * * * * * theme-files - * /ccm-ldn-theme/files/* + * /ccm-themedirector/files/* * * * @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"; } }