diff --git a/src/main/java/org/olat/admin/UserAdminMainController.java b/src/main/java/org/olat/admin/UserAdminMainController.java
index 0e6b6baa813e404d107f1b1026c126d5573ef4d0..3116368827bb7f7292eb040ab0561484f00ddec1 100644
--- a/src/main/java/org/olat/admin/UserAdminMainController.java
+++ b/src/main/java/org/olat/admin/UserAdminMainController.java
@@ -45,7 +45,8 @@ import org.olat.basesecurity.events.SingleIdentityChosenEvent;
import org.olat.core.commons.fullWebApp.LayoutMain3ColsController;
import org.olat.core.extensions.ExtManager;
import org.olat.core.extensions.Extension;
-import org.olat.core.extensions.action.ActionExtension;
+import org.olat.core.extensions.ExtensionElement;
+import org.olat.core.extensions.action.GenericActionExtension;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.panel.Panel;
@@ -228,8 +229,8 @@ public class UserAdminMainController extends MainLayoutBasicController implement
//in any case release delete user gui lock (reaquired if user deletion is again clicked)
releaseDeleteUserLock();
- if (uobject instanceof ActionExtension) {
- ActionExtension ae = (ActionExtension) uobject;
+ if (uobject instanceof GenericActionExtension) {
+ GenericActionExtension ae = (GenericActionExtension) uobject;
//fxdiff BAKS-7 Resume function
TreeNode node = ((GenericTreeModel)olatMenuTree.getTreeModel()).findNodeByUserObject(uobject);
OLATResourceable ores = OresHelper.createOLATResourceableInstance("AE", new Long(node.getPosition()));
@@ -713,8 +714,9 @@ public class UserAdminMainController extends MainLayoutBasicController implement
for (int i = 0; i < cnt; i++) {
Extension anExt = extm.getExtension(i);
// 1) general menu extensions
- ActionExtension ae = (ActionExtension) anExt.getExtensionFor(UserAdminMainController.class.getName() + EXTENSIONPOINT_MENU_MENUQUERIES, ureq);
- if (ae != null && anExt.isEnabled()) {
+ ExtensionElement ee = anExt.getExtensionFor(UserAdminMainController.class.getName() + EXTENSIONPOINT_MENU_MENUQUERIES, ureq);
+ if (ee instanceof GenericActionExtension && anExt.isEnabled()) {
+ GenericActionExtension ae = (GenericActionExtension)ee;
gtnChild = new GenericTreeNode();
String menuText = ae.getActionText(getLocale());
gtnChild.setTitle(menuText);
diff --git a/src/main/java/org/olat/commons/servlets/StaticsLegacyDispatcher.java b/src/main/java/org/olat/commons/servlets/StaticsLegacyDispatcher.java
index d0c4fe06fa0637891771702a284b55d52390779d..cc3f41e2d397efb6cfe2ccf75119902bc947d1a6 100644
--- a/src/main/java/org/olat/commons/servlets/StaticsLegacyDispatcher.java
+++ b/src/main/java/org/olat/commons/servlets/StaticsLegacyDispatcher.java
@@ -33,9 +33,9 @@ import javax.servlet.http.HttpServletResponse;
import org.olat.commons.servlets.pathhandlers.PathHandler;
import org.olat.commons.servlets.util.ResourceDescriptor;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
import org.olat.core.dispatcher.Dispatcher;
import org.olat.core.dispatcher.DispatcherAction;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.logging.Tracing;
/**
diff --git a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpMainController.java b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpMainController.java
index 9dfc1c1b7d875fd918e6058ed936d88560d16e95..26bcd1bd4995ffd6d21dc97c741de99d81672e9a 100644
--- a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpMainController.java
+++ b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpMainController.java
@@ -25,8 +25,8 @@ import java.util.Locale;
import org.apache.commons.lang.ArrayUtils;
import org.olat.core.commons.chiefcontrollers.LanguageChangedEvent;
import org.olat.core.commons.fullWebApp.LayoutMain3ColsController;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
import org.olat.core.dispatcher.DispatcherAction;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.control.Event;
diff --git a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpTopNavController.java b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpTopNavController.java
index 5545e2784a6482598a47455ebb3fede0f8b7154c..8044ea8f2bcb4a6c64f732de0c0c59f6e6a521ab 100644
--- a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpTopNavController.java
+++ b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpTopNavController.java
@@ -25,7 +25,7 @@ import java.util.Set;
import org.olat.core.CoreSpringFactory;
import org.olat.core.commons.chiefcontrollers.LanguageChangedEvent;
import org.olat.core.commons.fullWebApp.DefaultMinimalTopNavController;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.Windows;
import org.olat.core.gui.components.Window;
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/DefaultMinimalTopNavController.java b/src/main/java/org/olat/core/commons/fullWebApp/DefaultMinimalTopNavController.java
index 20c00a6815542b0b0c47f3ca9aa6f736b76d5030..58e9431c1e416ad9971b096420902aad686a62b9 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/DefaultMinimalTopNavController.java
+++ b/src/main/java/org/olat/core/commons/fullWebApp/DefaultMinimalTopNavController.java
@@ -19,7 +19,7 @@
*/
package org.olat.core.commons.fullWebApp;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.Windows;
import org.olat.core.gui.components.Component;
diff --git a/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml b/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
index 3477e21c17ac67b4b2349c7f59921ee1f1c15289..1ac104989168afeb7e5884c4ae4255441513e14c 100644
--- a/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
+++ b/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
@@ -171,7 +171,7 @@
<!-- static files delivery. See org.olat.core.dispatcher.mapper.package.html for more infos -->
<bean id="staticsrawbean"
- class="org.olat.core.defaults.dispatcher.StaticMediaDispatcher"
+ class="org.olat.core.dispatcher.impl.StaticMediaDispatcher"
>
<constructor-arg index="0">
<value>/raw/</value>
@@ -208,7 +208,7 @@
</bean>
-->
- <bean id="redirect2defaultbean" class = "org.olat.core.defaults.dispatcher.RedirectToDefaultDispatcher" />
+ <bean id="redirect2defaultbean" class = "org.olat.core.dispatcher.impl.RedirectToDefaultDispatcher" />
<!-- uncomment this and comment above line if automatic guest login should be enabled -->
<!--
<bean id="redirect2defaultbean" class = "org.olat.dispatcher.RedirectToAutoGuestLoginDispatcher" />
diff --git a/src/main/java/org/olat/core/defaults/dispatcher/RedirectToDefaultDispatcher.java b/src/main/java/org/olat/core/dispatcher/impl/RedirectToDefaultDispatcher.java
similarity index 97%
rename from src/main/java/org/olat/core/defaults/dispatcher/RedirectToDefaultDispatcher.java
rename to src/main/java/org/olat/core/dispatcher/impl/RedirectToDefaultDispatcher.java
index 1c4bb1f46a6fbfac80f1d5dfd51e01edeb5b2f50..00b5097614864be4ecbff94f10a529f8367032ec 100644
--- a/src/main/java/org/olat/core/defaults/dispatcher/RedirectToDefaultDispatcher.java
+++ b/src/main/java/org/olat/core/dispatcher/impl/RedirectToDefaultDispatcher.java
@@ -24,7 +24,7 @@
* <p>
*/
-package org.olat.core.defaults.dispatcher;
+package org.olat.core.dispatcher.impl;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/src/main/java/org/olat/core/defaults/dispatcher/StaticMediaDispatcher.java b/src/main/java/org/olat/core/dispatcher/impl/StaticMediaDispatcher.java
similarity index 99%
rename from src/main/java/org/olat/core/defaults/dispatcher/StaticMediaDispatcher.java
rename to src/main/java/org/olat/core/dispatcher/impl/StaticMediaDispatcher.java
index c40106012ad08ba69acceac03e3a1de0c2e5468e..6bcad5f18a5165442adcce6d5ebb9af611486177 100644
--- a/src/main/java/org/olat/core/defaults/dispatcher/StaticMediaDispatcher.java
+++ b/src/main/java/org/olat/core/dispatcher/impl/StaticMediaDispatcher.java
@@ -17,7 +17,7 @@
* frentix GmbH, http://www.frentix.com
* <p>
*/
-package org.olat.core.defaults.dispatcher;
+package org.olat.core.dispatcher.impl;
import java.io.File;
import java.io.UnsupportedEncodingException;
diff --git a/src/main/java/org/olat/core/extensions/AbstractExtension.java b/src/main/java/org/olat/core/extensions/AbstractExtension.java
index 9ef00d6965ae9f8545b5f5e4c9bf244aa01b8526..3c9d10c0a630598adc2c44f017411d02c9ecebe6 100644
--- a/src/main/java/org/olat/core/extensions/AbstractExtension.java
+++ b/src/main/java/org/olat/core/extensions/AbstractExtension.java
@@ -105,8 +105,8 @@ abstract public class AbstractExtension extends AbstractConfigOnOff implements E
}
} else {
// load a default callback
- @SuppressWarnings("unused")
ActionExtensionSecurityCallback aescDefault = new ActionExtensionSecurityCallback() {
+ @Override
public boolean isAllowedToLaunchActionController(UserRequest ureq) {
return true;
}
@@ -167,6 +167,9 @@ abstract public class AbstractExtension extends AbstractConfigOnOff implements E
return getExtensionFor(extensionPoint);
}
+ protected abstract ExtensionElement getExtensionFor(String extensionPoint);
+
+
public boolean isSecCallbackNameSet(){
return secCallbackName != null;
}
diff --git a/src/main/java/org/olat/core/extensions/Extension.java b/src/main/java/org/olat/core/extensions/Extension.java
index ef67559b68dd508b68aa84f1030a8834009109f0..36b296911a28ecb329457b19049c93446a5ad8fe 100644
--- a/src/main/java/org/olat/core/extensions/Extension.java
+++ b/src/main/java/org/olat/core/extensions/Extension.java
@@ -39,17 +39,9 @@ import org.olat.core.gui.UserRequest;
*/
public interface Extension extends ConfigOnOff, Comparable<Extension> {
- /**
- * @param extensionPoint
- * @return the handler for the extension (an ExtensionElement)
- * do a check here, if the extension is enabled and return null if not!
- * @deprecated fxdiff: better use method getExtensionFor(String extensionPoint, UserRequest ureq) to check per user!
- */
- public ExtensionElement getExtensionFor(String extensionPoint);
/**
- * fxdiff: FXOLAT-79
- * check with userrequest if extension will be available to this user!
+ * Check with userrequest if extension will be available to this user!
* also does isEnabled(). this is better than to loop over all extensions and do checks locally!
* returns null if not allowed to access or disabled
* @param extensionPoint
diff --git a/src/main/java/org/olat/core/extensions/action/GenericActionExtension.java b/src/main/java/org/olat/core/extensions/action/GenericActionExtension.java
index 6cf2cd2824650d61e2aa5f0560954762afbe7b7b..5fe02632488e9b2a17f17b47b30ada88b0a2b75a 100644
--- a/src/main/java/org/olat/core/extensions/action/GenericActionExtension.java
+++ b/src/main/java/org/olat/core/extensions/action/GenericActionExtension.java
@@ -112,7 +112,7 @@ public class GenericActionExtension extends AbstractExtension implements ActionE
* @see org.olat.core.extensions.action.ActionExtension#createController(org.olat.core.gui.UserRequest,
* org.olat.core.gui.control.WindowControl, java.lang.Object)
*/
- @SuppressWarnings("unused")
+ @Override
public Controller createController(UserRequest ureq, WindowControl wControl, Object arg) {
return actionControllerCreator.createController(ureq, wControl);
}
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementRenderer.java
index 3cec1c158fd7160c75ca3c0868086464827479c0..0a1c8ad74ddf1c3601c3b0e7bb444a218cf9b3fc 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementRenderer.java
@@ -23,7 +23,7 @@ package org.olat.core.gui.components.form.flexible.impl.elements;
import java.io.File;
import org.apache.commons.lang.StringEscapeUtils;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.ComponentRenderer;
import org.olat.core.gui.components.form.flexible.elements.FileElement;
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
index c1cca91e749e648ad94131d54375f4dfd86e8e44..d095b73bb955ba206c1af2d44b78df191b787842 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
@@ -32,7 +32,7 @@ import java.util.StringTokenizer;
import org.olat.core.CoreSpringFactory;
import org.olat.core.commons.controllers.linkchooser.CustomLinkTreeModel;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.dispatcher.mapper.Mapper;
import org.olat.core.dispatcher.mapper.MapperService;
import org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.TinyMCECustomPlugin;
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementComponent.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementComponent.java
index 989a363c5b3bbb720c05f978378a2a7564d95e58..1e36566a77946cf2a8098312d97b4d8362f85bbc 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementComponent.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementComponent.java
@@ -23,7 +23,7 @@ package org.olat.core.gui.components.form.flexible.impl.elements.richText;
import org.olat.core.commons.controllers.linkchooser.CustomLinkTreeModel;
import org.olat.core.commons.controllers.linkchooser.LinkChooserController;
import org.olat.core.commons.fullWebApp.LayoutMain3ColsController;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.Windows;
import org.olat.core.gui.components.ComponentRenderer;
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementRenderer.java
index 7db5ba4d7afbba14680ad7b621b8df326ca16578..f0b816fbaac135a4acef32a8f091fac89d1c720c 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementRenderer.java
@@ -23,7 +23,7 @@ package org.olat.core.gui.components.form.flexible.impl.elements.richText;
import java.util.List;
import org.apache.commons.lang.StringEscapeUtils;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.GUIInterna;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.ComponentRenderer;
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/TinyMCECustomPlugin.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/TinyMCECustomPlugin.java
index f7bad3d656c73666ebe7b3d2593e7767be160c94..b405604a6527b715e8c337837be900905a459b66 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/TinyMCECustomPlugin.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/TinyMCECustomPlugin.java
@@ -21,7 +21,7 @@ package org.olat.core.gui.components.form.flexible.impl.elements.richText.plugin
import java.util.Map;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.render.StringOutput;
/**
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmatheditor/OlatMathEditorPlugin.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmatheditor/OlatMathEditorPlugin.java
index 184856b453dded472c5189e3f21899d550bf7c0b..aa9b6f99dfbdc3a92eb4bf77e749b05b4cfc4228 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmatheditor/OlatMathEditorPlugin.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmatheditor/OlatMathEditorPlugin.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import org.olat.core.commons.chiefcontrollers.BaseChiefController;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.components.form.flexible.impl.elements.richText.RichTextConfiguration;
import org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.TinyMCECustomPlugin;
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/OlatMovieViewerPlugin.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/OlatMovieViewerPlugin.java
index 0d4d17138a12d977d6a7ca9462e8393fbcff8ee5..d6877ac3fd3471032b9e2e702bd84f1e8bd87c17 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/OlatMovieViewerPlugin.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/OlatMovieViewerPlugin.java
@@ -23,7 +23,7 @@ package org.olat.core.gui.components.form.flexible.impl.elements.richText.plugin
import java.util.HashMap;
import java.util.Map;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.components.form.flexible.impl.elements.richText.RichTextConfiguration;
import org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.TinyMCECustomPlugin;
import org.olat.core.util.WebappHelper;
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatsmileys/OlatSmileysPlugin.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatsmileys/OlatSmileysPlugin.java
index c4628bcf44aa2bcb1e72e4b5c20a246d4bd53ca6..fe8f0fa69e96c6ffc1b002ba3759a028570950d9 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatsmileys/OlatSmileysPlugin.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatsmileys/OlatSmileysPlugin.java
@@ -23,7 +23,7 @@ package org.olat.core.gui.components.form.flexible.impl.elements.richText.plugin
import java.util.HashMap;
import java.util.Map;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.components.form.flexible.impl.elements.richText.RichTextConfiguration;
import org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.TinyMCECustomPlugin;
diff --git a/src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java b/src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java
index bc21b8a0430ebca0268b47adb520b31af12a76e3..f38217e5316e5785f25330016f6fbd201b651179 100644
--- a/src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java
+++ b/src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java
@@ -28,7 +28,7 @@ import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
import org.olat.core.commons.chiefcontrollers.BaseChiefController;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.dispatcher.mapper.Mapper;
import org.olat.core.gui.media.MediaResource;
import org.olat.core.gui.media.NotFoundMediaResource;
diff --git a/src/main/java/org/olat/core/gui/control/winmgr/AjaxController.java b/src/main/java/org/olat/core/gui/control/winmgr/AjaxController.java
index 92040a5516dcc78276649e910696ace757725318..7df85f670fd8ed191ec2c80decc326abc8083d98 100644
--- a/src/main/java/org/olat/core/gui/control/winmgr/AjaxController.java
+++ b/src/main/java/org/olat/core/gui/control/winmgr/AjaxController.java
@@ -40,8 +40,8 @@ import org.json.JSONException;
import org.json.JSONObject;
import org.olat.admin.sysinfo.manager.SessionStatsManager;
import org.olat.core.CoreSpringFactory;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
import org.olat.core.dispatcher.DispatcherAction;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.dispatcher.mapper.Mapper;
import org.olat.core.dispatcher.mapper.MapperService;
import org.olat.core.gui.UserRequest;
diff --git a/src/main/java/org/olat/core/gui/render/Renderer.java b/src/main/java/org/olat/core/gui/render/Renderer.java
index 3554c2b59b676cd39d15caba7a20d89e25da2bf3..9d82a5dbb7bfa6478fa430588a5d18cf4ffd9f23 100644
--- a/src/main/java/org/olat/core/gui/render/Renderer.java
+++ b/src/main/java/org/olat/core/gui/render/Renderer.java
@@ -29,7 +29,7 @@ package org.olat.core.gui.render;
import java.util.Iterator;
import java.util.Map;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.GUIInterna;
import org.olat.core.gui.GlobalSettings;
import org.olat.core.gui.components.Component;
diff --git a/src/main/java/org/olat/core/gui/themes/Theme.java b/src/main/java/org/olat/core/gui/themes/Theme.java
index 0d6a977cede5ddad9a81d86593bbbb3fac1b76bc..ce88b850854c7cf57507b1f57b1a73c1592f9e97 100644
--- a/src/main/java/org/olat/core/gui/themes/Theme.java
+++ b/src/main/java/org/olat/core/gui/themes/Theme.java
@@ -21,7 +21,7 @@ package org.olat.core.gui.themes;
import java.io.File;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.render.StringOutput;
import org.olat.core.helpers.Settings;
import org.olat.core.util.WebappHelper;
diff --git a/src/main/java/org/olat/core/util/Formatter.java b/src/main/java/org/olat/core/util/Formatter.java
index 9f22813d30a95975a49150db6e513d6fffb3cb59..6d0e74993092c7bc234ebbf58c83aec151dfd386 100644
--- a/src/main/java/org/olat/core/util/Formatter.java
+++ b/src/main/java/org/olat/core/util/Formatter.java
@@ -43,7 +43,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.olat.core.commons.chiefcontrollers.BaseChiefController;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.render.StringOutput;
import org.olat.core.helpers.Settings;
diff --git a/src/main/java/org/olat/gui/control/OlatMinimalTopNavController.java b/src/main/java/org/olat/gui/control/OlatMinimalTopNavController.java
index e19947628685e20c29d35c090a44fab6a42616a6..f99c1b9f05c5ec282f0f09c52db518f21aab0021 100644
--- a/src/main/java/org/olat/gui/control/OlatMinimalTopNavController.java
+++ b/src/main/java/org/olat/gui/control/OlatMinimalTopNavController.java
@@ -24,7 +24,7 @@
*/
package org.olat.gui.control;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.Windows;
import org.olat.core.gui.components.Component;
diff --git a/src/main/java/org/olat/home/controllerCreators/HomePortalControllerCreator.java b/src/main/java/org/olat/home/controllerCreators/HomePortalControllerCreator.java
index fa571c4bf3288d8bc6eb73e55bf3a8701aef4b05..c521edc5bd37f6f32710768bcdea00194d16d66d 100644
--- a/src/main/java/org/olat/home/controllerCreators/HomePortalControllerCreator.java
+++ b/src/main/java/org/olat/home/controllerCreators/HomePortalControllerCreator.java
@@ -21,7 +21,7 @@ package org.olat.home.controllerCreators;
import org.olat.commons.rss.RSSUtil;
import org.olat.core.CoreSpringFactory;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.htmlheader.HtmlHeaderComponent;
diff --git a/src/main/java/org/olat/ims/qti/render/LocalizedXSLTransformer.java b/src/main/java/org/olat/ims/qti/render/LocalizedXSLTransformer.java
index 966c6d54f343268d7ffcec24f4d52335cba0a92e..312611c27c480fa9568dbab0703d160052768804 100644
--- a/src/main/java/org/olat/ims/qti/render/LocalizedXSLTransformer.java
+++ b/src/main/java/org/olat/ims/qti/render/LocalizedXSLTransformer.java
@@ -51,7 +51,7 @@ import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.dom.DOMDocument;
import org.dom4j.io.DocumentSource;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.translator.Translator;
import org.olat.core.logging.OLATRuntimeException;
import org.olat.core.logging.OLog;
diff --git a/src/main/java/org/olat/modules/cp/CPPrintMapper.java b/src/main/java/org/olat/modules/cp/CPPrintMapper.java
index 0fc59f90fd961c6c32b7fa13b214a65e7cacca6b..4c371c403f201c8615bbc7d828d9ce4ef778bcdf 100644
--- a/src/main/java/org/olat/modules/cp/CPPrintMapper.java
+++ b/src/main/java/org/olat/modules/cp/CPPrintMapper.java
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.batik.css.parser.ParseException;
import org.apache.batik.css.parser.Parser;
import org.cyberneko.html.parsers.SAXParser;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.dispatcher.mapper.Mapper;
import org.olat.core.gui.components.tree.TreeNode;
import org.olat.core.gui.media.MediaResource;
diff --git a/src/main/java/org/olat/notifications/PersonalRSSFeed.java b/src/main/java/org/olat/notifications/PersonalRSSFeed.java
index 3a57ca7ab6ab8b105795f7fa9cfe0b8d40abf2cd..168225dd4b06123f29a093219b662b92efb02245 100644
--- a/src/main/java/org/olat/notifications/PersonalRSSFeed.java
+++ b/src/main/java/org/olat/notifications/PersonalRSSFeed.java
@@ -26,7 +26,7 @@ import java.util.Locale;
import org.olat.commons.rss.RSSUtil;
import org.olat.commons.servlets.RSSServlet;
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
+import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.translator.Translator;
import org.olat.core.helpers.Settings;
import org.olat.core.id.Identity;