Skip to content

Commit

Permalink
SAK-29519 Mark the cloud content beans as lazy.
Browse files Browse the repository at this point in the history
The cloud-content Spring beans require configuration to work and spring will create then even if they are not used by any other beans. To prevent them being created and failing the startup we set them to be lazily inited.
  • Loading branch information
buckett committed Aug 2, 2015
1 parent 6718ae3 commit 254adb5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
6 changes: 3 additions & 3 deletions cloud-content/pack/src/webapp/WEB-INF/components.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 0 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 254adb5

Please sign in to comment.