You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/07/01 23:25:08 UTC

[24/50] [abbrv] git commit: updated refs/heads/vmsync to f737019

Include the solidfire plugin into componentContext

Signed-off-by: Prasanna Santhanam <ts...@apache.org>


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

Branch: refs/heads/vmsync
Commit: a24b8d8def76d1a9f1d55448c810cdf140f3a675
Parents: 1e0f833
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Sat Jun 29 16:51:27 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sat Jun 29 16:51:27 2013 +0530

----------------------------------------------------------------------
 client/tomcatconf/componentContext.xml.in | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a24b8d8d/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index a149327..966faf5 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -98,12 +98,14 @@
   It determines whether or not a adapter is activated or how it is loaded in order in its managing provider,
 
 -->
-  <bean id="CloudStackImageStoreProviderImpl"
+  <bean id="cloudStackImageStoreProviderImpl"
         class="org.apache.cloudstack.storage.datastore.provider.CloudStackImageStoreProviderImpl"/>
-  <bean id="S3ImageStoreProviderImpl"
+  <bean id="s3ImageStoreProviderImpl"
         class="org.apache.cloudstack.storage.datastore.provider.S3ImageStoreProviderImpl"/>
-  <bean id="SwiftImageStoreProviderImpl"
+  <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"
@@ -111,9 +113,10 @@
     <property name="providers">
       <list merge="true">
         <ref bean="CloudStackPrimaryDataStoreProviderImpl"/>
-        <ref local="CloudStackImageStoreProviderImpl"/>
-        <ref local="S3ImageStoreProviderImpl"/>
-        <ref local="SwiftImageStoreProviderImpl"/>
+        <ref local="cloudStackImageStoreProviderImpl"/>
+        <ref local="s3ImageStoreProviderImpl"/>
+        <ref local="swiftImageStoreProviderImpl"/>
+        <ref local="solidFireDataStoreProvider"/>
       </list>
     </property>
   </bean>