From 0d7da3e6e62e837e6aee3034f0770a24dacd0c8c Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Tue, 18 Sep 2007 16:01:50 +0000
Subject: [PATCH] Fix main entry point for the interpreters

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6816 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repo/admin/BaseInterpreter.java  | 19 ++++++++++---------
 .../repo/admin/RepoAdminInterpreter.java      |  8 +++-----
 .../repo/tenant/TenantInterpreter.java        |  7 +++++--
 .../repo/workflow/WorkflowInterpreter.java    |  7 +++----
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/source/java/org/alfresco/repo/admin/BaseInterpreter.java b/source/java/org/alfresco/repo/admin/BaseInterpreter.java
index 81810fcbfc..46a9774989 100755
--- a/source/java/org/alfresco/repo/admin/BaseInterpreter.java
+++ b/source/java/org/alfresco/repo/admin/BaseInterpreter.java
@@ -65,24 +65,25 @@ public abstract class BaseInterpreter extends AbstractLifecycleBean
      */
     protected String lastCommand = null;
     
-
-    /**
-     * Main entry point.
-     */
-    public static void main(String[] args)
+    
+    public static void runMain(String beanName)
     {
         ApplicationContext context = ApplicationContextHelper.getApplicationContext();
-        
-        BaseInterpreter console = getConsoleBean(context);
+        runMain(context, beanName);
+    }
+    
+    public static void runMain(ApplicationContext context, String beanName)
+    {
+        BaseInterpreter console = getConsoleBean(context, beanName);
 
         console.username = DEFAULT_ADMIN;
         console.rep();
         System.exit(0);
     }
     
-    public static BaseInterpreter getConsoleBean(ApplicationContext context)
+    public static BaseInterpreter getConsoleBean(ApplicationContext context, String beanName)
     {
-        return null;
+        return (BaseInterpreter)context.getBean(beanName);
     }
 
     /**
diff --git a/source/java/org/alfresco/repo/admin/RepoAdminInterpreter.java b/source/java/org/alfresco/repo/admin/RepoAdminInterpreter.java
index b41bd349cd..e4e2bf2006 100755
--- a/source/java/org/alfresco/repo/admin/RepoAdminInterpreter.java
+++ b/source/java/org/alfresco/repo/admin/RepoAdminInterpreter.java
@@ -34,7 +34,6 @@ import java.util.List;
 import org.alfresco.i18n.I18NUtil;
 import org.alfresco.service.cmr.admin.RepoAdminService;
 import org.alfresco.service.namespace.QName;
-import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
@@ -54,13 +53,12 @@ public class RepoAdminInterpreter extends BaseInterpreter
         this.repoAdminService = repoAdminService;
     }
 
-    
     /**
-     * 
+     * Main entry point.
      */
-    public static BaseInterpreter getConsoleBean(ApplicationContext context)
+    public static void main(String[] args)
     {
-        return (RepoAdminInterpreter)context.getBean("repoAdminInterpreter");
+        runMain("repoAdminInterpreter");
     }
 
     protected boolean hasAuthority(String username)
diff --git a/source/java/org/alfresco/repo/tenant/TenantInterpreter.java b/source/java/org/alfresco/repo/tenant/TenantInterpreter.java
index bcc27ea737..2e0969394c 100755
--- a/source/java/org/alfresco/repo/tenant/TenantInterpreter.java
+++ b/source/java/org/alfresco/repo/tenant/TenantInterpreter.java
@@ -61,9 +61,12 @@ public class TenantInterpreter extends BaseInterpreter
         this.authenticationService = authenticationService;
     }
 
-    public static BaseInterpreter getConsoleBean(ApplicationContext context)
+    /**
+     * Main entry point.
+     */
+    public static void main(String[] args)
     {
-        return (TenantInterpreter)context.getBean("tenantInterpreter");
+        runMain("tenantInterpreter");
     }
     
     
diff --git a/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java b/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
index ec7b78b315..c51abcdbb5 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
@@ -67,7 +67,6 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.GUID;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.core.io.ClassPathResource;
 
@@ -219,11 +218,11 @@ public class WorkflowInterpreter extends BaseInterpreter
     }
 
     /**
-     * 
+     * Main entry point.
      */
-    public static BaseInterpreter getConsoleBean(ApplicationContext context)
+    public static void main(String[] args)
     {
-        return (WorkflowInterpreter)context.getBean("workflowInterpreter");
+        runMain("workflowInterpreter");
     }
 
     protected boolean hasAuthority(String username)