From d751695bedc921991a63d14de09aab68efbc751c Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Tue, 10 Mar 2009 18:05:28 +0000
Subject: [PATCH] Merged V3.1 to HEAD    12904: Partial fix for ETHREEOH-1221

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13539 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/web-client-application-context.xml         | 2 +-
 .../org/alfresco/web/config/ConfigAdminInterpreter.java    | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/config/alfresco/web-client-application-context.xml b/config/alfresco/web-client-application-context.xml
index 7590e52f54..60e6e0fde0 100644
--- a/config/alfresco/web-client-application-context.xml
+++ b/config/alfresco/web-client-application-context.xml
@@ -225,7 +225,7 @@
    <bean id="webClientConfigAdminInterpreter" class="org.alfresco.web.config.ConfigAdminInterpreter">   
       <property name="transactionService" ref="transactionComponent"/>
       <property name="repoXMLConfigService" ref="webClientConfigService"/>
-      <property name="tenantService" ref="tenantService"/>        
+      <property name="authorityService" ref="AuthorityService"/>
    </bean>
    
    <bean id="webClientConfigAdminInterpreterHelp" class="org.alfresco.i18n.ResourceBundleBootstrapComponent"> 
diff --git a/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java b/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java
index 60f2c32cd7..0d67c014b6 100755
--- a/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java
+++ b/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2009 Alfresco Software Limited.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -66,11 +66,6 @@ public class ConfigAdminInterpreter extends BaseInterpreter
     	ApplicationContext context = new ClassPathXmlApplicationContext(new String[] {"classpath:alfresco/application-context.xml","classpath:alfresco/web-client-application-context.xml"});
         runMain(context, "webClientConfigAdminInterpreter");
     }
-    
-    protected boolean hasAuthority(String username)
-    {
-        return ((username != null) && (tenantService.getBaseNameUser(username).equals(BaseInterpreter.DEFAULT_ADMIN)));
-    }
 
     /**
      * Execute a single command using the BufferedReader passed in for any data needed.