Return-Path: 
 <commits-return-39181-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id F31D510E6C
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Thu, 13 Mar 2014 23:56:03 +0000 (UTC)
Received: (qmail 25027 invoked by uid 500); 13 Mar 2014 23:55:26 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 24063 invoked by uid 500); 13 Mar 2014 23:55:01 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 23856 invoked by uid 99); 13 Mar 2014 23:54:56 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2014 23:54:56 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id A2D4098076B; Thu, 13 Mar 2014 23:54:55 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: mchen@apache.org
To: commits@cloudstack.apache.org
Date: Thu, 13 Mar 2014 23:55:11 -0000
Message-Id: <7b5989f55aae40728fd59323f2b5739f@git.apache.org>
In-Reply-To: <12b9daed0a9e4902903d5ca04a968f98@git.apache.org>
References: <12b9daed0a9e4902903d5ca04a968f98@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [18/50] [abbrv] git commit: updated refs/heads/master to 8ff9460

Renaming all beans in the xml files to use IAM insteda of Acl


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/57b687e8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/57b687e8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/57b687e8

Branch: refs/heads/master
Commit: 57b687e8b61b769229efbdaed3ae047cf697fc81
Parents: 6309887
Author: Prachi Damle <prachi@cloud.com>
Authored: Tue Feb 25 16:58:42 2014 -0800
Committer: Prachi Damle <prachi@cloud.com>
Committed: Tue Feb 25 16:58:42 2014 -0800

----------------------------------------------------------------------
 .../cloudstack/core/spring-iam-server-context.xml       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57b687e8/services/iam/server/resources/META-INF/cloudstack/core/spring-iam-server-context.xml
----------------------------------------------------------------------
diff --git a/services/iam/server/resources/META-INF/cloudstack/core/spring-iam-server-context.xml b/services/iam/server/resources/META-INF/cloudstack/core/spring-iam-server-context.xml
index 82faa70..c9f383f 100644
--- a/services/iam/server/resources/META-INF/cloudstack/core/spring-iam-server-context.xml
+++ b/services/iam/server/resources/META-INF/cloudstack/core/spring-iam-server-context.xml
@@ -27,12 +27,12 @@
                       http://www.springframework.org/schema/context/spring-context-3.0.xsd"
                       >                     
 
-    <bean id="AclGroupDaoImpl" class="org.apache.cloudstack.iam.server.dao.AclGroupDaoImpl" />
-    <bean id="AclPolicyDaoImpl" class="org.apache.cloudstack.iam.server.dao.AclPolicyDaoImpl" />    
-    <bean id="AclGroupAccountMapDaoImpl" class="org.apache.cloudstack.iam.server.dao.AclGroupAccountMapDaoImpl" />
-    <bean id="AclGroupPolicyMapDaoImpl" class="org.apache.cloudstack.iam.server.dao.AclGroupPolicyMapDaoImpl" />    
-    <bean id="AclPolicyPermissionDaoImpl" class="org.apache.cloudstack.iam.server.dao.AclPolicyPermissionDaoImpl" />
-    <bean id="AclAccountPolicyMapDaoImpl" class="org.apache.cloudstack.iam.server.dao.AclAccountPolicyMapDaoImpl" />    
+    <bean id="IAMGroupDaoImpl" class="org.apache.cloudstack.iam.server.dao.IAMGroupDaoImpl" />
+    <bean id="IAMPolicyDaoImpl" class="org.apache.cloudstack.iam.server.dao.IAMPolicyDaoImpl" />    
+    <bean id="IAMGroupAccountMapDaoImpl" class="org.apache.cloudstack.iam.server.dao.IAMGroupAccountMapDaoImpl" />
+    <bean id="IAMGroupPolicyMapDaoImpl" class="org.apache.cloudstack.iam.server.dao.IAMGroupPolicyMapDaoImpl" />    
+    <bean id="IAMPolicyPermissionDaoImpl" class="org.apache.cloudstack.iam.server.dao.IAMPolicyPermissionDaoImpl" />
+    <bean id="IAMAccountPolicyMapDaoImpl" class="org.apache.cloudstack.iam.server.dao.IAMAccountPolicyMapDaoImpl" />    
 
         
     <bean id="IAMServiceImpl" class="org.apache.cloudstack.iam.server.IAMServiceImpl" />