diff --git a/ccm-cms-types-mparticle/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/mparticle-item.jsp b/ccm-cms-types-mparticle/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/mparticle-item.jsp.noLongerInUse
similarity index 100%
rename from ccm-cms-types-mparticle/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/mparticle-item.jsp
rename to ccm-cms-types-mparticle/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/mparticle-item.jsp.noLongerInUse
diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java
index 32b9cc0eb..971198f86 100755
--- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java
+++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java
@@ -50,20 +50,22 @@ public class MultiPartArticleLoader extends AbstractContentTypeLoader {
*/
public MultiPartArticleLoader() {
- m_template = new ResourceParameter
+ //Not needed anymore
+ /*m_template = new ResourceParameter
("com.arsdigita.cms.contenttypes.mparticle.template",
Parameter.REQUIRED,
"/WEB-INF/content-types/com/arsdigita/cms/contenttypes" +
"/mparticle-item.jsp");
- register(m_template);
+ register(m_template);*/
}
public String[] getTypes() {
return TYPES;
}
- @Override
+ //Not needed anymore
+ /*@Override
protected void prepareSection(final ContentSection section,
final ContentType type,
final LifecycleDefinition ld,
@@ -75,5 +77,5 @@ public class MultiPartArticleLoader extends AbstractContentTypeLoader {
(InputStream)get(m_template),
section, type,ld, wf);
- }
+ }*/
}
diff --git a/ccm-cms-types-mparticle/web/static/content-types/com/arsdigita/cms/contenttypes/MultiPartArticle.xsl b/ccm-cms-types-mparticle/web/static/content-types/com/arsdigita/cms/contenttypes/MultiPartArticle.xsl
index c2ade73bc..2fe12fbd0 100755
--- a/ccm-cms-types-mparticle/web/static/content-types/com/arsdigita/cms/contenttypes/MultiPartArticle.xsl
+++ b/ccm-cms-types-mparticle/web/static/content-types/com/arsdigita/cms/contenttypes/MultiPartArticle.xsl
@@ -60,6 +60,7 @@
+
-
+
+
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItem.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItem.java
index 16e8e4149..8c4dcfaa2 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItem.java
+++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItem.java
@@ -17,6 +17,9 @@
*/
package com.arsdigita.london.navigation.ui;
+import com.arsdigita.bebop.PageState;
+import java.util.logging.Level;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -26,6 +29,7 @@ import com.arsdigita.cms.CMS;
import com.arsdigita.cms.ContentBundle;
import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ContentItemXMLRenderer;
+import com.arsdigita.cms.ExtraXMLGenerator;
import com.arsdigita.cms.SecurityManager;
import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
import com.arsdigita.dispatcher.DispatcherHelper;
@@ -123,6 +127,15 @@ public class GreetingItem extends AbstractComponent {
renderer.walk(baseItem, SimpleXMLGenerator.ADAPTER_CONTEXT);*/
generateGreetingItemXml(itemEl, baseItem);
+
+ for(ExtraXMLGenerator generator : baseItem.getExtraXMLGenerators()) {
+ try {
+ generator.generateXML(baseItem, content, new PageState(null, request,
+ response));
+ } catch (ServletException ex) {
+ s_log.error(ex);
+ }
+ }
return content;
}