Skip to content
Snippets Groups Projects
Commit a4fabd2f authored by srosse's avatar srosse
Browse files

OO-3016: remove duplicate discovery path in spring configuration and aggregate... 

OO-3016: remove duplicate discovery path in spring configuration and aggregate some configuration to the module above
parent eab1dcd3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 74 deletions
src/main/java/org/olat/course/assessment/_spring/assessmentContext.xml
+ 0
− 2
View file @ a4fabd2f
......@@ -7,8 +7,6 @@
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
<context:component-scan base-package="org.olat.course.assessment" />
<bean id="assessmentNotificationsTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
<property name="jobDetail" ref="assessmentNotificationsJob" />
......
src/main/java/org/olat/course/db/_spring/coursedbContext.xml
+ 0
− 2
View file @ a4fabd2f
......@@ -7,8 +7,6 @@
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
<context:component-scan base-package="org.olat.course.db.impl" />
<bean id="courseDbWebService" class="org.olat.course.db.restapi.CourseDbWebService" />
......
src/main/java/org/olat/modules/_spring/modulesContext.xml
+ 42
− 2
View file @ a4fabd2f
......@@ -14,8 +14,6 @@
<import resource="classpath:/org/olat/modules/glossary/_spring/glossaryContext.xml"/>
<import resource="classpath:/org/olat/modules/iq/_spring/iqContext.xml"/>
<import resource="classpath:/org/olat/modules/lecture/_spring/lectureContext.xml"/>
<import resource="classpath:/org/olat/modules/openmeetings/_spring/openmeetingsContext.xml"/>
<import resource="classpath:/org/olat/modules/vitero/_spring/viteroContext.xml"/>
<import resource="classpath:/org/olat/modules/webFeed/_spring/webFeedContext.xml"/>
<import resource="classpath:/org/olat/modules/wiki/_spring/wikiContext.xml"/>
<import resource="classpath:/org/olat/modules/reminder/_spring/reminderContext.xml"/>
......@@ -104,4 +102,46 @@
</property>
</bean>
<!-- vitero admin. panel -->
<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
<property name="order" value="8228" />
<property name="actionController">
<bean class="org.olat.core.gui.control.creator.FactoryControllerCreator" scope="prototype">
<property name="factoryName" value="org.olat.modules.vitero.ViteroUIFactory"/>
<property name="factoryMethod" value="createViteroAdminController"/>
</bean>
</property>
<property name="navigationKey" value="vitero" />
<property name="parentTreeNodeIdentifier" value="externalToolsParent" />
<property name="i18nActionKey" value="admin.menu.title"/>
<property name="i18nDescriptionKey" value="admin.menu.title.alt"/>
<property name="translationPackage" value="org.olat.modules.vitero.ui"/>
<property name="extensionPoints">
<list>
<value>org.olat.admin.SystemAdminMainController</value>
</list>
</property>
</bean>
<!-- OpenMeetings admin. panel -->
<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
<property name="order" value="7210" />
<property name="actionController">
<bean class="org.olat.core.gui.control.creator.FactoryControllerCreator" scope="prototype">
<property name="factoryName" value="org.olat.modules.openmeetings.OpenMeetingsUIFactory"/>
<property name="factoryMethod" value="createAdminController"/>
</bean>
</property>
<property name="navigationKey" value="openmeetings" />
<property name="parentTreeNodeIdentifier" value="externalToolsParent" />
<property name="i18nActionKey" value="admin.menu.title"/>
<property name="i18nDescriptionKey" value="admin.menu.title.alt"/>
<property name="translationPackage" value="org.olat.modules.openmeetings.ui"/>
<property name="extensionPoints">
<list>
<value>org.olat.admin.SystemAdminMainController</value>
</list>
</property>
</bean>
</beans>
\ No newline at end of file
src/main/java/org/olat/modules/openmeetings/_spring/openmeetingsContext.xml deleted 100644 → 0
+ 0
− 34
View file @ eab1dcd3
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
<context:component-scan base-package="org.olat.modules.openmeetings" />
<!-- OpenMeetings admin. panel -->
<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
<property name="order" value="7210" />
<property name="actionController">
<bean class="org.olat.core.gui.control.creator.FactoryControllerCreator" scope="prototype">
<property name="factoryName" value="org.olat.modules.openmeetings.OpenMeetingsUIFactory"/>
<property name="factoryMethod" value="createAdminController"/>
</bean>
</property>
<property name="navigationKey" value="openmeetings" />
<property name="parentTreeNodeIdentifier" value="externalToolsParent" />
<property name="i18nActionKey" value="admin.menu.title"/>
<property name="i18nDescriptionKey" value="admin.menu.title.alt"/>
<property name="translationPackage" value="org.olat.modules.openmeetings.ui"/>
<property name="extensionPoints">
<list>
<value>org.olat.admin.SystemAdminMainController</value>
</list>
</property>
</bean>
</beans>
\ No newline at end of file
src/main/java/org/olat/modules/vitero/_spring/viteroContext.xml deleted 100644 → 0
+ 0
− 34
View file @ eab1dcd3
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
<context:component-scan base-package="org.olat.modules.vitero" />
<!-- vitero admin. panel -->
<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
<property name="order" value="8228" />
<property name="actionController">
<bean class="org.olat.core.gui.control.creator.FactoryControllerCreator" scope="prototype">
<property name="factoryName" value="org.olat.modules.vitero.ViteroUIFactory"/>
<property name="factoryMethod" value="createViteroAdminController"/>
</bean>
</property>
<property name="navigationKey" value="vitero" />
<property name="parentTreeNodeIdentifier" value="externalToolsParent" />
<property name="i18nActionKey" value="admin.menu.title"/>
<property name="i18nDescriptionKey" value="admin.menu.title.alt"/>
<property name="translationPackage" value="org.olat.modules.vitero.ui"/>
<property name="extensionPoints">
<list>
<value>org.olat.admin.SystemAdminMainController</value>
</list>
</property>
</bean>
</beans>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment