From 75ef47d97b10f52d69c63cd75539d848de93708b Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sun, 28 Aug 2011 09:35:24 +0000
Subject: [PATCH] =?UTF-8?q?Weitere=20Erg=C3=A4nzungen=20f=C3=BCr=20ExtraXM?=
 =?UTF-8?q?L:=20-=20GreetingItem=20verwendet=20jetzt=20auch=20die=20ExtraX?=
 =?UTF-8?q?MLGenerators=20-=20MultiPartArticle=20wird=20mit=20altem=20Them?=
 =?UTF-8?q?e=20jetzt=20auch=20dargestellt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@1075 8810af33-2d31-482b-a856-94f89814c4df
---
 ...le-item.jsp => mparticle-item.jsp.noLongerInUse} |  0
 .../cms/contenttypes/MultiPartArticleLoader.java    | 10 ++++++----
 .../arsdigita/cms/contenttypes/MultiPartArticle.xsl |  4 +++-
 .../london/navigation/ui/GreetingItem.java          | 13 +++++++++++++
 4 files changed, 22 insertions(+), 5 deletions(-)
 rename ccm-cms-types-mparticle/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/{mparticle-item.jsp => mparticle-item.jsp.noLongerInUse} (100%)

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 @@
         </td>
       </tr>
     </table>       
+    <xsl:apply-templates/>
   </xsl:template>
   
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.MultiPartArticle']" mode="cms:CT_text"
@@ -85,5 +86,6 @@
         </div>
       </xsl:if>
     </xsl:for-each>    
-  </xsl:template>
+    <xsl:apply-templates/>
+  </xsl:template>  
 </xsl:stylesheet>
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;        
     }