LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Some small fixes

deploy_packages_to_gitea
Jens Pelzetter 2022-04-20 19:50:01 +02:00
parent 6a23404b29
commit a68d25ba61
6 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-bundle-devel-wildfly/pom.xml
View File

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

4
ccm-bundle-devel/pom.xml
View File

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

2
ccm-cms/package-lock.json generated
View File

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

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

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

6
ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java
View File

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

3
ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutsFilter.java
View File

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