diff --git a/src/main/java/org/olat/admin/landingpages/_spring/landingPagesContext.xml b/src/main/java/org/olat/admin/landingpages/_spring/landingPagesContext.xml index fd23357dac3d1a9f14cedb3514e6ca91616647aa..f5757d67a1de19b04a8bf638275dfbea114908db 100644 --- a/src/main/java/org/olat/admin/landingpages/_spring/landingPagesContext.xml +++ b/src/main/java/org/olat/admin/landingpages/_spring/landingPagesContext.xml @@ -17,7 +17,7 @@ <bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints"> <property name="order" value="7206" /> - <property name="navigationKey" value="restapi" /> + <property name="navigationKey" value="landingpages" /> <property name="actionController"> <bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype"> <property name="className" value="org.olat.admin.landingpages.ui.LandingPagesAdminController"/> diff --git a/src/main/java/org/olat/core/commons/controllers/impressum/_spring/impressumContext.xml b/src/main/java/org/olat/core/commons/controllers/impressum/_spring/impressumContext.xml index b5d890e6ec753c2ad35600f19fda48315b02765b..c2d393ede84d75e0e6bb51dd9cdf63705bc5e743 100644 --- a/src/main/java/org/olat/core/commons/controllers/impressum/_spring/impressumContext.xml +++ b/src/main/java/org/olat/core/commons/controllers/impressum/_spring/impressumContext.xml @@ -56,7 +56,7 @@ <property name="className" value="org.olat.core.commons.controllers.impressum.ImpressumAdminController"/> </bean> </property> - <property name="navigationKey" value="layout" /> + <property name="navigationKey" value="impressum" /> <property name="translationPackage" value="org.olat.core.commons.controllers.impressum"/> <property name="i18nActionKey" value="menu.impressum"/> <property name="i18nDescriptionKey" value="menu.impressum.alt"/> diff --git a/src/main/java/org/olat/core/extensions/ExtManager.java b/src/main/java/org/olat/core/extensions/ExtManager.java index 8a12c841805286a92a26195c302b9a74a4aa390b..7453339e98823c4739e52302384bd25990084971 100644 --- a/src/main/java/org/olat/core/extensions/ExtManager.java +++ b/src/main/java/org/olat/core/extensions/ExtManager.java @@ -156,11 +156,13 @@ public class ExtManager extends LogDelegator { int count_duplid = 0; AtomicInteger count_duplnavkey = new AtomicInteger(0); + boolean debug = isLogDebugEnabled(); + // first build ordered list for (Extension extension : extensionValues) { - if (!extension.isEnabled()){ + if (!extension.isEnabled()) { count_disabled++; - logWarn("* Disabled Extension got loaded :: " + extension + ". Check yourself that you don't use it or that extension returns null for getExtensionFor() when disabled, resp. overwrite isEnabled().",null); + logInfo("* Disabled Extension got loaded :: " + extension + ". Check that you don't use it or that extension returns null for getExtensionFor() when disabled, resp. overwrite isEnabled().",null); } int orderKey = extension.getOrder(); @@ -173,7 +175,7 @@ public class ExtManager extends LogDelegator { } if (orderKeys.containsKey(orderKey)) { Extension occupant = orderKeys.get(orderKey); - logDebug("Extension-Configuration Problem: Dublicate order-value ("+extension.getOrder()+") for extension=" + extension + ", orderKey already occupied by "+occupant,null); + if(debug) logDebug("Extension-Configuration Problem: Dublicate order-value ("+extension.getOrder()+") for extension=" + extension + ", orderKey already occupied by "+occupant,null); } else { orderKeys.put(orderKey, extension); } @@ -203,7 +205,7 @@ public class ExtManager extends LogDelegator { } } } - logDebug("Created unique-id "+uid+" for extension:: "+extension); + if(debug) logDebug("Created unique-id "+uid+" for extension:: "+extension); } logInfo("Devel-Info :: initExtensions done. :: "+count_disabled+" disabled Extensions, "+count_duplid+" extensions with duplicate ids, "+count_duplnavkey+ " extensions with duplicate navigationKeys"); Collections.sort(extensionsList); diff --git a/src/main/java/org/olat/repository/_spring/repositoryContext.xml b/src/main/java/org/olat/repository/_spring/repositoryContext.xml index ec98a8fa92da0d6e3cb5c70320bb7c78e4d4a168..515340c620d10a549e296182c180cb22d2ffb231 100644 --- a/src/main/java/org/olat/repository/_spring/repositoryContext.xml +++ b/src/main/java/org/olat/repository/_spring/repositoryContext.xml @@ -19,7 +19,7 @@ <property name="factoryMethod" value="createLifecylceAdminController"/> </bean> </property> - <property name="navigationKey" value="vitero" /> + <property name="navigationKey" value="lifecycles" /> <property name="parentTreeNodeIdentifier" value="modulesParent" /> <property name="i18nActionKey" value="admin.menu.lifecycle.title"/> <property name="i18nDescriptionKey" value="admin.lifecycles.title"/>