From d0a7b174b57e34dc7f7f7e42c7f01534444567c2 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 12 Sep 2011 23:31:00 +0000
Subject: [PATCH] =?UTF-8?q?RSS=20Feed=20teilweise=20gefixt,=20Loader=20ang?=
 =?UTF-8?q?epasst.=20Scheint=20aber=20immer=20noch=20nicht=20richtig=20zu?=
 =?UTF-8?q?=20funktionieren,=20Admin=20Oberfl=C3=A4che=20wird=20noch=20ver?=
 =?UTF-8?q?misst.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@1117 8810af33-2d31-482b-a856-94f89814c4df
---
 .../src/com/arsdigita/london/rss/Initializer.java     | 11 +++++++++++
 ccm-ldn-rss/src/com/arsdigita/london/rss/Loader.java  | 11 ++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/Initializer.java b/ccm-ldn-rss/src/com/arsdigita/london/rss/Initializer.java
index a963c5499..fe404e35a 100755
--- a/ccm-ldn-rss/src/com/arsdigita/london/rss/Initializer.java
+++ b/ccm-ldn-rss/src/com/arsdigita/london/rss/Initializer.java
@@ -22,6 +22,7 @@ package com.arsdigita.london.rss;
 
 import com.arsdigita.db.DbHelper;
 import com.arsdigita.domain.DomainObject;
+import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.kernel.ACSObjectInstantiator;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.pdl.ManifestSource;
@@ -64,6 +65,16 @@ public class Initializer extends CompoundInitializer {
 
         super.init(e);
 
+        // Prerequisite to access a RSS channel instance
+        DomainObjectFactory.registerInstantiator(
+               RSS.BASE_DATA_OBJECT_TYPE, new ACSObjectInstantiator() {
+                   @Override
+                   public DomainObject doNewInstance(DataObject dataObject) {
+                       return new RSS(dataObject);
+                   }
+               }
+        );
+
 
         e.getFactory().registerInstantiator(
                 WorkspaceDirectoryPortlet.BASE_DATA_OBJECT_TYPE,
diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/Loader.java b/ccm-ldn-rss/src/com/arsdigita/london/rss/Loader.java
index 4b64a79db..615fab387 100755
--- a/ccm-ldn-rss/src/com/arsdigita/london/rss/Loader.java
+++ b/ccm-ldn-rss/src/com/arsdigita/london/rss/Loader.java
@@ -64,7 +64,7 @@ public class Loader extends PackageLoader {
                 // (i.e. create application type)
                 setupChannelControlCenter();
 
-                // Load local fveeds into database
+                // Load local feeds into database
                 setupLocalFeeds();
 
                 // load portlet type into database
@@ -78,6 +78,8 @@ public class Loader extends PackageLoader {
      * (old style) compatible applicaiton.
      */
     public void setupChannelControlCenter() {
+        
+/*        
         ApplicationSetup setup = new ApplicationSetup(s_log);
 
         setup.setApplicationObjectType(RSS.BASE_DATA_OBJECT_TYPE);
@@ -93,7 +95,14 @@ public class Loader extends PackageLoader {
             });
         ApplicationType type = setup.run();
         type.save();
+*/
+        ApplicationType type = ApplicationType.createApplicationType(
+                                              "rss",
+                                              "RSS Channels",
+                                              RSS.BASE_DATA_OBJECT_TYPE);
+        type.setDescription("RSS Channels");
 
+        
         if (!Application.isInstalled(RSS.BASE_DATA_OBJECT_TYPE,
                                      "/channels/")) {
             Application app =