etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <tsp@apache.org>
(cherry picked from commit 01debd59d3)
This commit is contained in:
Prasanna Santhanam 2013-07-01 13:47:16 +05:30
parent b4f6b57ef5
commit 9f12a25191
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/tomcatconf/applicationContext.xml.in
View File

@ -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>

2
client/tomcatconf/componentContext.xml.in
View File

@ -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"/>

19
client/tomcatconf/nonossComponentContext.xml.in
View File

@ -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>

2
client/tomcatconf/simulatorComponentContext.xml.in
View File

@ -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>