removed the CompositeProducerFactory

diff --git a/source/mir/producer/CompositeProducerNode.java b/source/mir/producer/CompositeProducerNode.java
index 4154d33..0ce4962 100755 (executable)
--- a/source/mir/producer/CompositeProducerNode.java
+++ b/source/mir/producer/CompositeProducerNode.java
@@ -24,6 +24,10 @@ public class CompositeProducerNode implements ProducerNode {
     subNodes.add(aSubNode);
   }
 
+  public void clear() {
+    subNodes.clear();
+  }
+
   public void produce(Map aValueSet, String aVerb, PrintWriter aLogger) throws ProducerFailure {
     Iterator i = subNodes.iterator();
 

diff --git a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
index c55b155..9e60273 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
@@ -19,42 +19,49 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
     return producerFactories;
   };
 
-  protected void setupContentFactory(CompositeProducerFactory aContentFactory) {
+  protected void setupContentFactory(CompositeProducerNode aProducerNode) {
   }
 
-  protected void setupStartPageFactory(CompositeProducerFactory aStartPageFactory) {
+  protected void setupStartPageFactory(CompositeProducerNode aProducerNode) {
   }
 
-  protected void setupSynchronizationFactory(CompositeProducerFactory aSynchronizationFactory) {
+  protected void setupSynchronizationFactory(CompositeProducerNode aProducerNode) {
+                         if(MirGlobal.getConfigBooleanProperty("Rsync")){
+      aProducerNode.addSubNode(
+        new ScriptCallingProducerNode(MirGlobal.getConfigProperty("Rsync.Script.Path"))
+      );
+    }
   }
 
-  protected void setupStaticFactory(CompositeProducerFactory aStaticFactory) {
+  protected void setupStaticFactory(CompositeProducerNode aProducerNode) {
+  }
+
+  protected void setupTopicsFactory(CompositeProducerNode aProducerNode) {
   }
 
   protected void setupFactories(Map aFactoriesMap ) {
+    CompositeProducerNode node;
 
-    CompositeProducerFactory factory;
+    node = new CompositeProducerNode();
+    setupContentFactory( node );
+    aFactoriesMap.put("content", new NodedProducerFactory(node));
 
-    factory=new CompositeProducerFactory();
-    setupContentFactory(factory);
-    aFactoriesMap.put("content", factory);
+    node = new CompositeProducerNode();
+    setupStartPageFactory( node );
+    aFactoriesMap.put("startpage", new NodedProducerFactory(node));
 
-    factory=new CompositeProducerFactory();
-    setupStartPageFactory(factory);
-    aFactoriesMap.put("startpage", factory);
+    node = new CompositeProducerNode();
+    setupSynchronizationFactory( node );
+    aFactoriesMap.put("synchronization", new NodedProducerFactory(node));
 
-    factory=new CompositeProducerFactory();
-    setupSynchronizationFactory(factory);
-    aFactoriesMap.put("synchronization", factory);
+    node = new CompositeProducerNode();
+    setupStaticFactory( node );
+    aFactoriesMap.put("static", new NodedProducerFactory(node));
 
-    factory=new CompositeProducerFactory();
-    setupStaticFactory(factory);
-    aFactoriesMap.put("static", factory);
+    node = new CompositeProducerNode();
+    setupTopicsFactory( node );
+    aFactoriesMap.put("topics", new NodedProducerFactory(node));
 
     aFactoriesMap.put("images", new OldProducerAdapterFactory(new ProducerImages()));
-/*    aFactoriesMap.put("navigationold", new OldProducerAdapterFactory(new ProducerNavigation()));
-    aFactoriesMap.put("openposting", new OldProducerAdapterFactory(new ProducerOpenPosting()));
-    aFactoriesMap.put("topics", new OldProducerAdapterFactory(new ProducerTopics()));
-*/
   };
 }

diff --git a/source/mircoders/producer/CompositeProducer.java b/source/mircoders/producer/CompositeProducer.java
deleted file mode 100755 (executable)
index 9ce0c0d..0000000
--- a/source/mircoders/producer/CompositeProducer.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package mircoders.producer;
-
-import java.util.*;
-import java.io.*;
-import mir.producer.*;
-
-public class CompositeProducer implements mir.producer.Producer {
-
-  List producers;
-
-  public CompositeProducer() {
-    producers = new Vector();
-  }
-
-  public void addProducer(mir.producer.Producer aProducer) {
-    producers.add(aProducer);
-  }
-
-  public void produce( PrintWriter aLogger ) throws ProducerFailure {
-    Iterator i;
-
-    i=producers.iterator();
-
-    while (i.hasNext())
-      ((mir.producer.Producer) i.next()).produce(aLogger);
-  }
-}

diff --git a/source/mircoders/producer/CompositeProducerFactory.java b/source/mircoders/producer/CompositeProducerFactory.java
deleted file mode 100755 (executable)
index 5b1de14..0000000
--- a/source/mircoders/producer/CompositeProducerFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package mircoders.producer;
-
-import java.util.*;
-import mir.entity.*;
-import mir.producer.*;
-import mircoders.storage.*;
-
-public class CompositeProducerFactory implements ProducerFactory {
-  Map factories;          // verb -> Vector ( ProducerFactory )
-
-  public CompositeProducerFactory() {
-    factories = new HashMap();
-  }
-
-  private List factoriesForVerb(String aVerb) {
-    List result;
-
-    result=(List) factories.get(aVerb);
-
-    if (result==null) {
-      result=new Vector();
-
-      factories.put(aVerb, result);
-    }
-
-    return result;
-  }
-
-  public void addFactory(ProducerFactory aFactory) {
-    Iterator i;
-
-    i=aFactory.verbs();
-
-    while (i.hasNext()) {
-      factoriesForVerb((String) i.next()).add(aFactory);
-    }
-  }
-
-  public mir.producer.Producer makeProducer(String aVerb) throws ProducerFailure {
-    CompositeProducer result = new CompositeProducer();
-
-    Iterator i=factoriesForVerb(aVerb).iterator();
-
-    while (i.hasNext())
-      result.addProducer(((ProducerFactory) i.next()).makeProducer(aVerb));
-
-    return result;
-  }
-
-  public Iterator verbs() {
-    return factories.keySet().iterator();
-  }
-}

diff --git a/source/mircoders/producer/NullProducer.java b/source/mircoders/producer/NullProducer.java
deleted file mode 100755 (executable)
index 3ddf158..0000000
--- a/source/mircoders/producer/NullProducer.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package mircoders.producer;
-
-import java.io.*;
-import mir.producer.*;
-
-public class NullProducer implements mir.producer.Producer {
-  public NullProducer() {
-  }
-
-  public void produce( PrintWriter aLogger ) throws ProducerFailure {
-  }
-}
-
-
-

diff --git a/source/mircoders/producer/NullProducerFactory.java b/source/mircoders/producer/NullProducerFactory.java
deleted file mode 100755 (executable)
index 60240e9..0000000
--- a/source/mircoders/producer/NullProducerFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package mircoders.producer;
-
-import java.io.*;
-import java.util.*;
-import mir.producer.*;
-
-public class NullProducerFactory implements ProducerFactory {
-  List verbs;
-
-  public NullProducerFactory() {
-    verbs = new Vector();
-  }
-
-  public void addVerb(String aVerb) {
-    verbs.add(aVerb);
-  }
-
-  public mir.producer.Producer makeProducer(String aVerb) {
-    return new NullProducer();
-  }
-
-
-  public Iterator verbs() {
-    return verbs.iterator();
-  }
-}

diff --git a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java
index 057d4f8..d0f0e83 100755 (executable)
--- a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java
+++ b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java
@@ -11,9 +11,24 @@ import mircoders.entity.adapter.*;
 
 public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
 
-  protected void setupContentFactory(CompositeProducerFactory aContentFactory) {
+  protected void setupContentFactory(CompositeProducerNode aNode) {
+  }
+
+  protected void setupStartPageFactory(CompositeProducerNode aNode) {
+  }
+
+  protected void setupSynchronizationFactory(CompositeProducerNode aNode) {
+  }
+
+  protected void setupStaticFactory(CompositeProducerNode aNode) {
+  }
+
+  protected void setupTopicsFactory(CompositeProducerNode aNode) {
+  }
 
-/*    EntityEnumeratingProducerNode contentNode = null;
+/*  protected void setupContentFactory(CompositeProducerFactory aContentFactory) {
+
+    EntityEnumeratingProducerNode contentNode = null;
 
     try {
       contentNode =
@@ -37,7 +52,7 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
     contentNode.addVerb( "new", "is_published='1' and is_produced='f'", "" );
 
     aContentFactory.addFactory( new NodedProducerFactory( contentNode ) );
-*/
+
 
 //  public EntityEnumeratingProducerNode(String aKey, StorageObject aStorage, EntityAdapterDefinition aDefinition, ProducerNode aSubNode) {
 
@@ -57,7 +72,7 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
   }
 
   protected void setupStartPageFactory(CompositeProducerFactory aStartPageFactory) {
-/*    ProducerNode topicNode = null;
+    ProducerNode topicNode = null;
 
     try {
       topicNode =
@@ -84,7 +99,7 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
     aStartPageFactory.addFactory( new NodedProducerFactory( startPageNode ) );
 
 
-/*
+
     aStartPageFactory.addFactory(
       new TopicStartPageProducerFactory(
           "producer/citystart.template",
@@ -117,11 +132,11 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
           0,
           MirGlobal.getConfigIntegerProperty("Producer.StartPage.Newswire")));
 
-*/
+
   }
 
   protected void setupStaticFactory(CompositeProducerFactory aStaticFactory) {
-/*    aStaticFactory.addFactory(
+    aStaticFactory.addFactory(
       new StaticProducerFactory(
           "producer/nav.template",
           "bundles.admin",
@@ -156,6 +171,7 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer {
           "producer/articlepost.template",
           "bundles.admin",
           MirGlobal.getConfigProperty("Producer.StorageRoot") + "/nl/articlepost.shtml"));
-*/  }
+  }
+*/
 
 }

diff --git a/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java b/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
index 3424e87..8d36b16 100755 (executable)
--- a/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
+++ b/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
@@ -11,8 +11,9 @@ import mircoders.entity.adapter.*;
 
 public class EHProducerLocalizer extends MirBasicProducerLocalizer {
 
-  protected void setupContentFactory(CompositeProducerFactory aContentFactory) {
+  protected void setupContentFactory(CompositeProducerNode aProducerNode) {
     EntityEnumeratingProducerNode contentNode = null;
+    aProducerNode.clear();
 
     try {
       contentNode =
@@ -42,15 +43,14 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
     contentNode.addVerb( "all", "is_published='1'", "" );
     contentNode.addVerb( "new", "is_published='1' and is_produced='f'", "" );
 
-    aContentFactory.addFactory( new NodedProducerFactory( contentNode ) );
+    aProducerNode.addSubNode( contentNode );
 
   }
 
-  protected void setupStartPageFactory(CompositeProducerFactory aStartPageFactory) {
-    ProducerNode startPageNode = null;
-
+  protected void setupStartPageFactory(CompositeProducerNode aProducerNode) {
+    aProducerNode.clear();
     try {
-      startPageNode =
+      aProducerNode.addSubNode(
             new EntityListProducerNode("newswire", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
                     "is_published='1' and to_article_type = ${articletype.newswire}", "date desc, webdb_create desc", 40, 0,
               new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
@@ -73,31 +73,18 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
                   )
                 )
               )
-            );
+            )
+      );
     }
     catch (Throwable t) {
     }
-
-    aStartPageFactory.addFactory( new NodedProducerFactory( startPageNode ) );
-  }
-
-  protected void setupSynchronizationFactory(CompositeProducerFactory aSynchronizationFactory) {
-/*    if(MirGlobal.getConfigBooleanProperty("Rsync")){
-      aSynchronizationFactory.addFactory(
-        new ScriptCallProducerFactory(MirGlobal.getConfigProperty("Rsync.Script.Path")));
-    }
-    else {
-*/      NullProducerFactory nullFactory = new NullProducerFactory();
-      nullFactory.addVerb("run");
-      aSynchronizationFactory.addFactory(nullFactory);
-/*    }*/
   }
 
-  protected void setupStaticFactory(CompositeProducerFactory aStaticFactory) {
-    ProducerNode staticNode = null;
+  protected void setupStaticFactory(CompositeProducerNode aProducerNode) {
+    aProducerNode.clear();
 
     try {
-      staticNode =
+      aProducerNode.addSubNode(
           new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
                   "", "code", 10, 0,
             new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
@@ -108,18 +95,17 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
                 )
               )
             )
-          );
+          )
+      );
     }
     catch (Throwable t) {
     }
-
-    aStaticFactory.addFactory( new NodedProducerFactory( staticNode ) );
   }
 
-  protected void setupFactories(Map aFactoriesMap ) {
-    EntityBatchingProducerNode topicPageNode = null;
+  protected void setupTopicsFactory(CompositeProducerNode aProducerNode) {
+    aProducerNode.clear();
 
-    super.setupFactories(aFactoriesMap);
+    EntityBatchingProducerNode topicPageNode = null;
 
     try {
       topicPageNode =
@@ -151,8 +137,7 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
       topicPageNode.addVerb("all", -1);
       topicPageNode.addVerb("new", 3);
 
-      aFactoriesMap.put("topics",
-        new NodedProducerFactory(
+      aProducerNode.addSubNode(
           new EntityEnumeratingProducerNode( "topic", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "", "",
             new EntityListProducerNode("topicspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
                   "is_published='1' and to_article_type = ${articletype.topicspecial} and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date, webdb_create", 1, 0,
@@ -162,11 +147,14 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
               )
             )
           )
-        )
       );
     }
     catch (Throwable t) {
     }
 
   }
+
+  protected void setupFactories(Map aFactoriesMap ) {
+    super.setupFactories(aFactoriesMap);
+  }
 }

diff --git a/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java b/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
index 1cfe809..4bc33ad 100755 (executable)
--- a/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
+++ b/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
@@ -11,7 +11,7 @@ import mircoders.entity.adapter.*;
 
 public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
 
-  protected void setupContentFactory(CompositeProducerFactory aContentFactory) {
+  protected void setupContentFactory(CompositeProducerNode aProducerNode) {
     EntityEnumeratingProducerNode contentNode = null;
 
     try {
@@ -20,17 +20,17 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
             new CompositeProducerNode( new ProducerNode[] {
               new GeneratingProducerNode(
                   "/producer/indymedia.nl/content.template",
-                  "${config.storageRoot}/content/${content.date.year}/${content.date.month}/${content.id}.inc"
+                  "${config.storageRoot}/content/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.inc"
               ),
               new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
                 new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
                     new CompositeProducerNode( new ProducerNode[] {
                       new GeneratingProducerNode(
                           "/producer/indymedia.nl/article.template",
-                          "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date..formatted.MM}/${content.id}.shtml"
+                          "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml"
                       ),
                       new FileDateSettingProducerNode(
-                          "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date..formatted.MM}/${content.id}.shtml",
+                          "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml",
                           "content.date.date"
                       )
                     } )
@@ -43,33 +43,14 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     }
 
     contentNode.addVerb( "all", "is_published='1'", "" );
-    contentNode.addVerb( "all", "is_published='1' and is_produced='f'", "" );
+    contentNode.addVerb( "new", "is_published='1' and is_produced='f'", "" );
 
-    aContentFactory.addFactory( new NodedProducerFactory( contentNode ) );
-
-
-/*
-    aContentFactory.addFactory(
-      new ContentProducerFactory(
-      "producer/content.template",
-      "bundles.admin",
-      MirGlobal.getConfigProperty("Producer.StorageRoot") + "/content/${contentyear}/${contentmonth}/${contentid}.inc",
-      Integer.parseInt(MirGlobal.getConfigProperty("Producer.Content.Batchsize"))));
-
-    aContentFactory.addFactory(
-      new ContentProducerFactory(
-      "producer/article.template",
-      "bundles.admin",
-      MirGlobal.getConfigProperty("Producer.StorageRoot") + "/nl/${contentyear}/${contentmonth}/${contentid}.shtml",
-      Integer.parseInt(MirGlobal.getConfigProperty("Producer.Content.Batchsize"))));
- */
+    aProducerNode.addSubNode( contentNode );
   }
 
-  protected void setupStartPageFactory(CompositeProducerFactory aStartPageFactory) {
-    ProducerNode startPageNode = null;
-
+  protected void setupStartPageFactory(CompositeProducerNode aProducerNode) {
     try {
-      startPageNode =
+      aProducerNode.addSubNode(
             new EntityListProducerNode("newswire", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
                     "is_published='1' and to_article_type = 1", "date desc, webdb_create desc", 40, 0,
               new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
@@ -105,51 +86,63 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                         )
                     })
               )
-            );
+            )
+      );
     }
     catch (Throwable t) {
     }
+  }
 
-    aStartPageFactory.addFactory( new NodedProducerFactory( startPageNode ) );
-/*
-    aStartPageFactory.addFactory(
-      new StartPageProducerFactory(
-          "producer/start.template",
-          "bundles.admin",
-          MirGlobal.getConfigProperty("Producer.StorageRoot") + "/nl/start.shtml",
-          MirGlobal.getConfigIntegerProperty("Producer.StartPage.Items"),
-          0));
+  protected void setupTopicsFactory(CompositeProducerNode aProducerNode) {
+    EntityBatchingProducerNode topicPageNode = null;
 
-    aStartPageFactory.addFactory(
-      new StartPageProducerFactory(
-          "producer/newswire.template",
-          "bundles.admin",
-          MirGlobal.getConfigProperty("Producer.StorageRoot") + "/nl/newswire.inc",
-          0,
-          MirGlobal.getConfigIntegerProperty("Producer.StartPage.Newswire")));
-*/
-  }
+    try {
+      topicPageNode =
+        new EntityBatchingProducerNode( "articles", "batch", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+              "is_published='1' and to_article_type = ${articletype.newswire} and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date asc, webdb_create asc", 6, 5, 0,
+          new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
+                  "", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+              new ResourceBundleProducerNode("lang", "producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/indymedia.nl/topic.template",
+                    "${config.storageRoot}/${language.code}/${topic.filename}/${topic.filename}${batch.current.identifier}.shtml"
+                )
+              )
+            )
+          ),
+          new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
+                  "", "code", 10, 0,
+            new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+              new ResourceBundleProducerNode("lang", "producer_${language.code}",
+                new GeneratingProducerNode(
+                    "/producer/indymedia.nl/topicnavigation.template",
+                    "${config.storageRoot}/${language.code}/${topic.filename}/${topic.filename}navigation.inc"
+                )
+              )
+            )
+          )
+        );
+      topicPageNode.addVerb("all", -1);
+      topicPageNode.addVerb("new", 3);
 
-  protected void setupSynchronizationFactory(CompositeProducerFactory aSynchronizationFactory) {
-/*    if(MirGlobal.getConfigBooleanProperty("Rsync")){
-      aSynchronizationFactory.addFactory(
-        new ScriptCallProducerFactory(MirGlobal.getConfigProperty("Rsync.Script.Path")));
+      aProducerNode.addSubNode(
+          new EntityEnumeratingProducerNode( "topic", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "", "",
+            new EntityListProducerNode("topicspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+                  "is_published='1' and to_article_type = ${articletype.topicspecial} and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date, webdb_create", 1, 0,
+              topicPageNode
+            )
+          )
+      );
     }
-    else {
-*/
-      NullProducerFactory nullFactory = new NullProducerFactory();
-      nullFactory.addVerb("run");
-      aSynchronizationFactory.addFactory(nullFactory);
-/*
+    catch (Throwable t) {
     }
- */
   }
 
-  protected void setupStaticFactory(CompositeProducerFactory aStaticFactory) {
-    ProducerNode staticNode = null;
 
+  protected void setupStaticFactory(CompositeProducerNode aProducerNode) {
     try {
-      staticNode =
+      aProducerNode.addSubNode(
           new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
                   "", "code", 10, 0,
               new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
@@ -210,12 +203,11 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
                   } )
                 )
               )
-          );
+          )
+      );
     }
     catch (Throwable t) {
     }
-
-    aStaticFactory.addFactory( new NodedProducerFactory( staticNode ) );
   }
 
   protected void setupFactories(Map aFactoriesMap ) {
@@ -271,23 +263,5 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
     catch (Throwable t) {
     }
     aFactoriesMap.put("featurestest", new NodedProducerFactory( node ) );
-
-/*
-    aStartPageFactory.addFactory(
-      new StartPageProducerFactory(
-          "producer/start.template",
-          "bundles.admin",
-          MirGlobal.getConfigProperty("Producer.StorageRoot") + "/nl/start.shtml",
-          MirGlobal.getConfigIntegerProperty("Producer.StartPage.Items"),
-          0));
-
-    aStartPageFactory.addFactory(
-      new StartPageProducerFactory(
-          "producer/newswire.template",
-          "bundles.admin",
-          MirGlobal.getConfigProperty("Producer.StorageRoot") + "/nl/newswire.inc",
-          0,
-          MirGlobal.getConfigIntegerProperty("Producer.StartPage.Newswire")));
-*/
   }
 }