CLOUDSTACK-1917: Finalize componentContext.xml/nonComponentContext.xml content organization to be plugin friendly, merge the fix with latest master changes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1274d8f6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1274d8f6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1274d8f6 Branch: refs/heads/cisco-vnmc-api-integration Commit: 1274d8f68a7d5961d8fc363d8a4952dd6835c252 Parents: c062808 Author: Kelven Yang <[email protected]> Authored: Thu Apr 4 15:52:45 2013 -0700 Committer: Kelven Yang <[email protected]> Committed: Thu Apr 4 15:52:45 2013 -0700 ---------------------------------------------------------------------- client/tomcatconf/applicationContext.xml.in | 50 +----------------- client/tomcatconf/componentContext.xml.in | 12 ++++ client/tomcatconf/nonossComponentContext.xml.in | 12 ++++ 3 files changed, 26 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1274d8f6/client/tomcatconf/applicationContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 50a755a..0b4ba82 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -392,54 +392,6 @@ <property name="name" value="PLAINTEXT"/> </bean> - <bean id="accountManagerImpl" class="com.cloud.user.AccountManagerImpl" > - <property name="UserAuthenticators"> - <list> - <ref bean="SHA256SaltedUserAuthenticator"/> - <ref bean="MD5UserAuthenticator"/> - <ref bean="LDAPUserAuthenticator"/> - <ref bean="PlainTextUserAuthenticator"/> - </list> - </property> - <property name="UserPasswordEncoders"> - <list> - <ref bean="SHA256SaltedUserAuthenticator"/> - <ref bean="MD5UserAuthenticator"/> - <ref bean="LDAPUserAuthenticator"/> - <ref bean="PlainTextUserAuthenticator"/> - </list> - </property> - <property name="SecurityCheckers"> - <list> - <ref bean="domainChecker"/> - </list> - </property> - </bean> - - <bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl"> - <property name="UserAuthenticators"> - <list> - <ref bean="SHA256SaltedUserAuthenticator"/> - <ref bean="MD5UserAuthenticator"/> - <ref bean="LDAPUserAuthenticator"/> - <ref bean="PlainTextUserAuthenticator"/> - </list> - </property> - <property name="UserPasswordEncoders"> - <list> - <ref bean="SHA256SaltedUserAuthenticator"/> - <ref bean="MD5UserAuthenticator"/> - <ref bean="LDAPUserAuthenticator"/> - <ref bean="PlainTextUserAuthenticator"/> - </list> - </property> - <property name="HostAllocators"> - <list> - <ref bean="FirstFitRouting"/> - </list> - </property> - </bean> - <!-- Network Elements --> @@ -649,11 +601,13 @@ --> <bean id="accountManagerImpl" class="com.cloud.user.AccountManagerImpl" > <property name="UserAuthenticators" value="#{userAuthenticators.Adapters}" /> + <property name="UserPasswordEncoders" value="#{userPasswordEncoders.Adapters}" /> <property name="SecurityCheckers" value="#{securityCheckers.Adapters}" /> </bean> <bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl"> <property name="UserAuthenticators" value="#{userAuthenticators.Adapters}" /> + <property name="UserPasswordEncoders" value="#{userPasswordEncoders.Adapters}" /> <property name="HostAllocators" value="#{hostAllocators.Adapters}" /> </bean> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1274d8f6/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index e2e6834..a006708 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -82,8 +82,20 @@ <bean id="userAuthenticators" class="com.cloud.utils.component.AdapterList"> <property name="Adapters"> <list> + <ref bean="SHA256SaltedUserAuthenticator"/> <ref bean="MD5UserAuthenticator"/> <ref bean="LDAPUserAuthenticator"/> + <ref bean="PlainTextUserAuthenticator"/> + </list> + </property> + </bean> + <bean id="userPasswordEncoders" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> + <list> + <ref bean="SHA256SaltedUserAuthenticator"/> + <ref bean="MD5UserAuthenticator"/> + <ref bean="LDAPUserAuthenticator"/> + <ref bean="PlainTextUserAuthenticator"/> </list> </property> </bean> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1274d8f6/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index 9b23698..5aec888 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -163,8 +163,20 @@ <bean id="userAuthenticators" class="com.cloud.utils.component.AdapterList"> <property name="Adapters"> <list> + <ref bean="SHA256SaltedUserAuthenticator"/> <ref bean="MD5UserAuthenticator"/> <ref bean="LDAPUserAuthenticator"/> + <ref bean="PlainTextUserAuthenticator"/> + </list> + </property> + </bean> + <bean id="userPasswordEncoders" class="com.cloud.utils.component.AdapterList"> + <property name="Adapters"> + <list> + <ref bean="SHA256SaltedUserAuthenticator"/> + <ref bean="MD5UserAuthenticator"/> + <ref bean="LDAPUserAuthenticator"/> + <ref bean="PlainTextUserAuthenticator"/> </list> </property> </bean>
