cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [2/2] git commit: updated refs/heads/rbac to 6c1849f
Date Wed, 15 Jan 2014 00:20:50 GMT
Fix Spring wiring issues in starting up MS.

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

Branch: refs/heads/rbac
Commit: 6c1849f4bf2f75b1893244ff11cb39c85609383d
Parents: 6583cb3
Author: Min Chen <min.chen@citrix.com>
Authored: Tue Jan 14 16:20:30 2014 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Tue Jan 14 16:20:30 2014 -0800

----------------------------------------------------------------------
 client/pom.xml                                       | 15 ++++++++++-----
 ...spring-core-lifecycle-api-context-inheritable.xml |  5 +++++
 .../core/spring-core-registry-core-context.xml       |  5 +++++
 .../contrail/management/MockAccountManager.java      |  6 ++++++
 .../core/spring-server-core-managers-context.xml     |  1 +
 .../test/com/cloud/user/MockAccountManagerImpl.java  |  6 ++++++
 services/iam/pom.xml                                 |  2 ++
 services/iam/server/pom.xml                          |  7 +++++++
 8 files changed, 42 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c1849f4/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index b6b65ba..e00651b 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -47,11 +47,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-plugin-acl-role-based-access-checkers</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-plugin-dedicated-resources</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -202,6 +197,16 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-plugin-iam</artifactId>
+      <version>${project.version}</version>
+    </dependency>   
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-iam</artifactId>
+      <version>${project.version}</version>
+    </dependency>         
+    <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
       <scope>runtime</scope>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c1849f4/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
b/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
index b0ed228..f406841 100644
--- a/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
@@ -45,6 +45,11 @@
     </bean>
     
     <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
+        <property name="registry" ref="querySelectorsRegistry" />
+        <property name="typeClass" value="org.apache.cloudstack.acl.QuerySelector" />
+    </bean>
+        
+    <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
         <property name="registry" ref="userPasswordEncodersRegistry" />
         <property name="typeClass" value="com.cloud.server.auth.UserAuthenticator" />
     </bean>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c1849f4/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
index c2467b1..aa210bc 100644
--- a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
+++ b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
@@ -234,6 +234,11 @@
         class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
         <property name="excludeKey" value="api.checkers.exclude" />
     </bean>
+    
+    <bean id="querySelectorsRegistry"
+        class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
+        <property name="excludeKey" value="query.selectors.exclude" />
+    </bean>    
 
     <bean id="apiCommandsRegistry"
         class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c1849f4/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
index a814805..44d705a 100644
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
@@ -371,6 +371,12 @@ public class MockAccountManager extends ManagerBase implements AccountManager
{
         // TODO Auto-generated method stub
 
     }
+
+    @Override
+    public List<String> listAclGroupsByAccount(Long accountId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
     
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c1849f4/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
----------------------------------------------------------------------
diff --git a/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
b/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
index 7c7ef0a..e762ad1 100644
--- a/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
+++ b/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
@@ -33,6 +33,7 @@
         <property name="userPasswordEncoders"
             value="#{userPasswordEncodersRegistry.registered}" />
         <property name="securityCheckers" value="#{securityCheckersRegistry.registered}"
/>
+        <property name="querySelectors" value="#{querySelectorsRegistry.registered}" />
       
     </bean>
 
     <bean id="managementServerImpl" class="com.cloud.server.ManagementServerImpl">

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c1849f4/server/test/com/cloud/user/MockAccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java b/server/test/com/cloud/user/MockAccountManagerImpl.java
index 271d9ae..c3f081d 100644
--- a/server/test/com/cloud/user/MockAccountManagerImpl.java
+++ b/server/test/com/cloud/user/MockAccountManagerImpl.java
@@ -347,4 +347,10 @@ public class MockAccountManagerImpl extends ManagerBase implements Manager,
Acco
 
     }
 
+    @Override
+    public List<String> listAclGroupsByAccount(Long accountId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c1849f4/services/iam/pom.xml
----------------------------------------------------------------------
diff --git a/services/iam/pom.xml b/services/iam/pom.xml
index ea5c05a..72353e0 100644
--- a/services/iam/pom.xml
+++ b/services/iam/pom.xml
@@ -34,6 +34,7 @@
     <module>plugin</module>
     <module>server</module>
   </modules>
+  <!-- 
   <dependencies>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
@@ -53,5 +54,6 @@
       <scope>test</scope>      
     </dependency>	
   </dependencies>
+  -->
   
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c1849f4/services/iam/server/pom.xml
----------------------------------------------------------------------
diff --git a/services/iam/server/pom.xml b/services/iam/server/pom.xml
index 8157cc0..f5e5ae0 100644
--- a/services/iam/server/pom.xml
+++ b/services/iam/server/pom.xml
@@ -41,5 +41,12 @@
       <artifactId>cloud-api</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-api</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>      
+    </dependency>       
   </dependencies>
 </project>


Mime
View raw message