Merge pull request sakaiproject#945 from buckett/SAK-29519

SAK-29519 Mark the cloud content beans as lazy.
stetsche · Aug 3, 2015 · 0f6aa65 · 0f6aa65
2 parents cc60f40 + 254adb5
commit 0f6aa65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/cloud-content/pack/src/webapp/WEB-INF/components.xml b/cloud-content/pack/src/webapp/WEB-INF/components.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
 <beans>
-
+  <!-- These beans are lazy inited as they won't startup unless correctly configured -->
   <bean id="org.sakaiproject.content.api.FileSystemHandler.swift" class="coza.opencollab.sakai.cloudcontent.SwiftFileSystemHandler"
-        init-method="init" destroy-method="destroy">
+        init-method="init" destroy-method="destroy" lazy-init="true">
   </bean>
 
   <bean id="org.sakaiproject.content.api.FileSystemHandler.blobstore" class="coza.opencollab.sakai.cloudcontent.BlobStoreFileSystemHandler"
-        init-method="init" destroy-method="destroy">
+        init-method="init" destroy-method="destroy" lazy-init="true">
   </bean>
 
 </beans>
diff --git a/pom.xml b/pom.xml
@@ -56,9 +56,7 @@
                 <module>citations</module>
                 <module>common</module>
                 <module>config</module>
-                <!--
                 <module>cloud-content</module>
-                -->
                 <module>content</module>
                 <module>content-review</module>
                 <module>courier</module>
@@ -137,9 +135,7 @@
                 <module>clogdashboardintegration</module>
                 <module>common</module>
                 <module>config</module>
-                <!--
                 <module>cloud-content</module>
-                -->
                 <module>content</module>
                 <module>content-review</module>
                 <module>courier</module>