merged 1.1 branch into head

[mir.git] / source / mircoders / localizer / basic / MirBasicGeneratorLocalizer.java

diff --git a/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java b/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java
index 5ee08d9..cd9afe3 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,67 +18,83 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package mircoders.localizer.basic;
 
-import freemarker.template.*;
-import mir.misc.*;
-import mir.generator.*;
-import mircoders.localizer.*;
-import mircoders.global.*;
+import mir.generator.FreemarkerGenerator;
+import mir.generator.Generator;
+import mir.generator.GeneratorLibraryRepository;
+import mir.generator.TALGenerator;
+import mir.generator.VelocityGenerator;
+import mir.generator.WriterEngine;
+import mir.log.LoggerWrapper;
+import mircoders.global.MirGlobal;
+import mircoders.localizer.MirGeneratorLocalizer;
+import mircoders.localizer.MirLocalizerExc;
+import mircoders.localizer.MirLocalizerFailure;
 
 public class MirBasicGeneratorLocalizer implements MirGeneratorLocalizer {
-  protected static Logfile logger = Logfile.getInstance( MirGlobal.getConfigProperty("Home") + "/" + MirGlobal.getConfigProperty("Mir.Localizer.Logfile"));
   private GeneratorLibraryRepository repository;
+  protected LoggerWrapper logger;
 
   public MirBasicGeneratorLocalizer () {
     repository = new GeneratorLibraryRepository();
+    logger = new LoggerWrapper("Localizer.Basic.Generator");
 
     buildRepository(repository);
   }
 
   protected void buildRepository(GeneratorLibraryRepository aRepository) {
-    aRepository.registerLibraryFactory("freemarker", new FreemarkerGenerator.FreemarkerGeneratorLibraryFactory( MirGlobal.getConfigProperty("Home") ) );
+    aRepository.registerLibraryFactory(
+        "freemarker",
+        new FreemarkerGenerator.FreemarkerGeneratorLibraryFactory(
+            MirGlobal.config().getHome()));
+
+    aRepository.registerLibraryFactory(
+        "velocity",
+        new VelocityGenerator.VelocityGeneratorLibraryFactory(MirGlobal.config().getHome() ) );
+
+    aRepository.registerLibraryFactory(
+        "tal",
+        new TALGenerator.TALGeneratorLibraryFactory(MirGlobal.config().getHome() ) );
   }
 
-  public Generator.GeneratorLibrary makeProducerGeneratorLibrary() throws MirLocalizerException, MirLocalizerFailure {
+  public Generator.Library makeProducerGeneratorLibrary() throws MirLocalizerExc, MirLocalizerFailure {
     try {
-      return repository.constructCompositeLibrary(MirGlobal.getConfigProperty("Mir.Localizer.Producer.GeneratorLibrary"));
+      return repository.constructCompositeLibrary(MirGlobal.config().getStringArray("Mir.Localizer.Producer.GeneratorLibrary"));
     }
     catch (Throwable t) {
       throw new MirLocalizerFailure(t);
     }
-  };
+  }
 
-  public Generator.GeneratorLibrary makeAdminGeneratorLibrary() throws MirLocalizerException, MirLocalizerFailure {
+  public Generator.Library makeAdminGeneratorLibrary() throws MirLocalizerExc, MirLocalizerFailure {
     try {
-      return repository.constructCompositeLibrary(MirGlobal.getConfigProperty("Mir.Localizer.Admin.GeneratorLibrary"));
+      return repository.constructCompositeLibrary(MirGlobal.config().getStringArray("Mir.Localizer.Admin.GeneratorLibrary"));
     }
     catch (Throwable t) {
       throw new MirLocalizerFailure(t);
     }
-  };
+  }
 
-  public Generator.GeneratorLibrary makeOpenPostingGeneratorLibrary() throws MirLocalizerException, MirLocalizerFailure {
+  public Generator.Library makeOpenPostingGeneratorLibrary() throws MirLocalizerExc, MirLocalizerFailure {
     try {
-      return repository.constructCompositeLibrary(MirGlobal.getConfigProperty("Mir.Localizer.OpenPosting.GeneratorLibrary"));
+      return repository.constructCompositeLibrary(MirGlobal.config().getStringArray("Mir.Localizer.OpenPosting.GeneratorLibrary"));
     }
     catch (Throwable t) {
       throw new MirLocalizerFailure(t);
     }
-  };
+  }
 
-  public WriterEngine makeWriterEngine() throws MirLocalizerException, MirLocalizerFailure {
-    return new MirBasicWriterEngine(MirGlobal.getConfigProperty("Mir.DefaultEncoding"));
+  public WriterEngine makeWriterEngine() throws MirLocalizerExc, MirLocalizerFailure {
+    return new MirBasicWriterEngine(MirGlobal.config().getString("Mir.DefaultEncoding"));
   }
 }