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

no-jira: remove duplicate keys of extensions

parent d6ed5d00
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints"> <bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
<property name="order" value="7206" /> <property name="order" value="7206" />
<property name="navigationKey" value="restapi" /> <property name="navigationKey" value="landingpages" />
<property name="actionController"> <property name="actionController">
<bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype"> <bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
<property name="className" value="org.olat.admin.landingpages.ui.LandingPagesAdminController"/> <property name="className" value="org.olat.admin.landingpages.ui.LandingPagesAdminController"/>
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<property name="className" value="org.olat.core.commons.controllers.impressum.ImpressumAdminController"/> <property name="className" value="org.olat.core.commons.controllers.impressum.ImpressumAdminController"/>
</bean> </bean>
</property> </property>
<property name="navigationKey" value="layout" /> <property name="navigationKey" value="impressum" />
<property name="translationPackage" value="org.olat.core.commons.controllers.impressum"/> <property name="translationPackage" value="org.olat.core.commons.controllers.impressum"/>
<property name="i18nActionKey" value="menu.impressum"/> <property name="i18nActionKey" value="menu.impressum"/>
<property name="i18nDescriptionKey" value="menu.impressum.alt"/> <property name="i18nDescriptionKey" value="menu.impressum.alt"/>
......
...@@ -156,11 +156,13 @@ public class ExtManager extends LogDelegator { ...@@ -156,11 +156,13 @@ public class ExtManager extends LogDelegator {
int count_duplid = 0; int count_duplid = 0;
AtomicInteger count_duplnavkey = new AtomicInteger(0); AtomicInteger count_duplnavkey = new AtomicInteger(0);
boolean debug = isLogDebugEnabled();
// first build ordered list // first build ordered list
for (Extension extension : extensionValues) { for (Extension extension : extensionValues) {
if (!extension.isEnabled()){ if (!extension.isEnabled()) {
count_disabled++; 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(); int orderKey = extension.getOrder();
...@@ -173,7 +175,7 @@ public class ExtManager extends LogDelegator { ...@@ -173,7 +175,7 @@ public class ExtManager extends LogDelegator {
} }
if (orderKeys.containsKey(orderKey)) { if (orderKeys.containsKey(orderKey)) {
Extension occupant = orderKeys.get(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 { } else {
orderKeys.put(orderKey, extension); orderKeys.put(orderKey, extension);
} }
...@@ -203,7 +205,7 @@ public class ExtManager extends LogDelegator { ...@@ -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"); logInfo("Devel-Info :: initExtensions done. :: "+count_disabled+" disabled Extensions, "+count_duplid+" extensions with duplicate ids, "+count_duplnavkey+ " extensions with duplicate navigationKeys");
Collections.sort(extensionsList); Collections.sort(extensionsList);
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<property name="factoryMethod" value="createLifecylceAdminController"/> <property name="factoryMethod" value="createLifecylceAdminController"/>
</bean> </bean>
</property> </property>
<property name="navigationKey" value="vitero" /> <property name="navigationKey" value="lifecycles" />
<property name="parentTreeNodeIdentifier" value="modulesParent" /> <property name="parentTreeNodeIdentifier" value="modulesParent" />
<property name="i18nActionKey" value="admin.menu.lifecycle.title"/> <property name="i18nActionKey" value="admin.menu.lifecycle.title"/>
<property name="i18nDescriptionKey" value="admin.lifecycles.title"/> <property name="i18nDescriptionKey" value="admin.lifecycles.title"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment