Some small fixes

ccm-bundle-devel-wildfly/pom.xml

@@ -224,14 +224,14 @@
                                 <include>WEB-INF/</include>
                             </includes>
                         </overlay>
-                        <overlay>
+<!--                        <overlay>
                             <groupId>org.libreccm</groupId>
                             <artifactId>ccm-shortcuts</artifactId>
                             <type>jar</type>
                             <includes>
                                 <include>WEB-INF/</include>
                             </includes>
-                        </overlay>
+                        </overlay>-->
                         <overlay>
                             <groupId>org.libreccm</groupId>
                             <artifactId>ccm-core</artifactId>

ccm-bundle-devel/pom.xml

@@ -51,11 +51,11 @@
         </dependency>
 
         <!-- CCM modules -->
-        <dependency>
+<!--        <dependency>
             <groupId>org.libreccm</groupId>
             <artifactId>ccm-shortcuts</artifactId>
             <version>${project.parent.version}</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms</artifactId>

ccm-cms/package-lock.json

@@ -1,5 +1,5 @@
 {
-    "name": "ccm-cms",
+    "name": "@librecms/ccm-cms",
     "version": "7.0.0",
     "lockfileVersion": 1,
     "requires": true,

ccm-core/src/main/java/org/libreccm/ui/AbstractMessagesBean.java

@@ -167,7 +167,10 @@ public abstract class AbstractMessagesBean extends AbstractMap<String, String> {
             .keySet()
             .stream()
             .collect(
-                Collectors.toMap(key -> key, key -> messages.getString(key))
+                Collectors.toMap(
+                    key -> key,
+                    key -> messages.getString(key)
+                )
             )
             .entrySet();
     }

ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java

@@ -29,6 +29,8 @@ import org.libreccm.modules.UnInstallEvent;
 import org.libreccm.ui.admin.applications.shortcuts.ShortcutsApplicationController;
 import org.libreccm.web.ApplicationType;
 
+import javax.servlet.http.HttpServlet;
+
 /**
  * The {@code Shortcuts} module for CCM. Defines the {@code Shortcuts}
  * application and sets up the module when the module is installed.
@@ -45,7 +47,9 @@ import org.libreccm.web.ApplicationType;
             descBundle = ShortcutsConstants.SHORTCUTS_BUNDLE,
             singleton = true,
             creator = ShortcutsApplicationCreator.class,
-            applicationController = ShortcutsApplicationController.class
+            applicationController = ShortcutsApplicationController.class,
+            servlet = HttpServlet.class,
+            servletPath = ""
         )}
 )
 public class Shortcuts implements CcmModule {

ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutsFilter.java

@@ -47,7 +47,8 @@ import javax.servlet.http.HttpServletResponse;
 public class ShortcutsFilter implements Filter {
 
     private final static Logger LOGGER = LogManager.getLogger(
-        ShortcutsFilter.class);
+        ShortcutsFilter.class
+    );
 
     @Inject
     private ShortcutRepository shortcutRepository;