Fix injection of datastoreproviders in nonoss context the datastore provider references are not in application context anymore and have been moved to respective componentCOntexts. Plug them in by default for nonoss server to startup successfully.
Signed-off-by: Prasanna Santhanam <t...@apache.org> (cherry picked from commit 01debd59d3a21c4164e4ef7e6f4d9e279933e34f) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9f12a251 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9f12a251 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9f12a251 Branch: refs/heads/vmsync Commit: 9f12a251919f2223b17fdd6b10ea5bc99096a1d1 Parents: b4f6b57 Author: Prasanna Santhanam <t...@apache.org> Authored: Mon Jul 1 13:47:16 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Mon Jul 1 13:52:53 2013 +0530 ---------------------------------------------------------------------- client/tomcatconf/applicationContext.xml.in | 4 ++-- client/tomcatconf/componentContext.xml.in | 2 +- client/tomcatconf/nonossComponentContext.xml.in | 19 +++++++++++++------ .../tomcatconf/simulatorComponentContext.xml.in | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f12a251/client/tomcatconf/applicationContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 3d5d4fa..14255c1 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -688,7 +688,7 @@ <property name="imageDataStoreMgr" ref="imageStoreProviderMgr"/> </bean> - <bean id="CloudStackPrimaryDataStoreProviderImpl" + <bean id="cloudStackPrimaryDataStoreProviderImpl" class="org.apache.cloudstack.storage.datastore.provider.CloudStackPrimaryDataStoreProviderImpl"/> <bean id="dataStoreProviderManager" @@ -696,7 +696,7 @@ <property name="providers"> <list> <!--Data Store Providers--> - <ref bean="CloudStackPrimaryDataStoreProviderImpl"/> + <ref bean="cloudStackPrimaryDataStoreProviderImpl"/> </list> </property> </bean> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f12a251/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index 966faf5..1fbec61 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -112,7 +112,7 @@ class="org.apache.cloudstack.storage.datastore.provider.DataStoreProviderManagerImpl"> <property name="providers"> <list merge="true"> - <ref bean="CloudStackPrimaryDataStoreProviderImpl"/> + <ref bean="cloudStackPrimaryDataStoreProviderImpl"/> <ref local="cloudStackImageStoreProviderImpl"/> <ref local="s3ImageStoreProviderImpl"/> <ref local="swiftImageStoreProviderImpl"/> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f12a251/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index e7828e1..ffa6281 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -195,17 +195,24 @@ </property> </bean> - <!--<bean id="SolidfirePrimaryDataStoreProvider" class="org.apache.cloudstack.storage.datastore.provider.SolidfirePrimaryDataStoreProvider"/>--> + <bean id="cloudStackImageStoreProviderImpl" + class="org.apache.cloudstack.storage.datastore.provider.CloudStackImageStoreProviderImpl"/> + <bean id="s3ImageStoreProviderImpl" + class="org.apache.cloudstack.storage.datastore.provider.S3ImageStoreProviderImpl"/> + <bean id="swiftImageStoreProviderImpl" + class="org.apache.cloudstack.storage.datastore.provider.SwiftImageStoreProviderImpl"/> + <bean id="solidFireDataStoreProvider" + class="org.apache.cloudstack.storage.datastore.provider.SolidfirePrimaryDataStoreProvider"/> + <!--Storage Providers--> <bean id="dataStoreProviderManager" class="org.apache.cloudstack.storage.datastore.provider.DataStoreProviderManagerImpl"> <property name="providers"> <list merge="true"> - <ref bean="CloudStackPrimaryDataStoreProviderImpl"/> - <ref bean="CloudStackImageStoreProviderImpl"/> - <ref bean="S3ImageStoreProviderImpl"/> - <ref bean="SwiftImageStoreProviderImpl"/> - <!--<ref local="SolidfirePrimaryDataStoreProvider"/>--> + <ref bean="cloudStackPrimaryDataStoreProviderImpl"/> + <ref bean="cloudStackImageStoreProviderImpl"/> + <ref bean="s3ImageStoreProviderImpl"/> + <ref bean="solidFireDataStoreProvider"/> </list> </property> </bean> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f12a251/client/tomcatconf/simulatorComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/simulatorComponentContext.xml.in b/client/tomcatconf/simulatorComponentContext.xml.in index 579ae1b..92278a4 100644 --- a/client/tomcatconf/simulatorComponentContext.xml.in +++ b/client/tomcatconf/simulatorComponentContext.xml.in @@ -45,7 +45,7 @@ <!--Override the cloudstack default image store provider to use simulator defined provider--> <list> <!--Data Store Providers--> - <ref bean="CloudStackPrimaryDataStoreProviderImpl"/> + <ref bean="cloudStackPrimaryDataStoreProviderImpl"/> <ref bean="SimulatorImageStoreProviderImpl"/> </list> </property>
