Skip to content

Commit

Permalink
Fix module startup issues
Browse files Browse the repository at this point in the history
  • Loading branch information
eschleb committed Dec 5, 2024
1 parent f5d0d1f commit 3f2e7da
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.merkle.oss.magnolia.testing.configuration;

import info.magnolia.cms.core.SystemProperty;
import info.magnolia.cms.filters.MgnlMainFilter;
import info.magnolia.cms.util.CustomFilterConfig;
import info.magnolia.context.AbstractSystemContext;
Expand Down Expand Up @@ -59,6 +60,8 @@ public void init(final ExtensionContext extensionContext) throws Exception {

final IntegrationTestMagnoliaConfigurationProperties properties = platformComponentProvider.newInstance(IntegrationTestMagnoliaConfigurationProperties.class, appRootDir);
properties.init();
// Connect legacy properties to the MagnoliaConfigurationProperties object
SystemProperty.setMagnoliaConfigurationProperties(properties);
//ConfigLoader.JAAS_PROPERTYNAME
System.setProperty("java.security.auth.login.config", properties.getProperty("jaas.config"));

Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/default-test-magnolia.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ magnolia.clusterid=test-01
magnolia.password.manager.key.location=${magnolia.home}/password-manager-key
magnolia.upload.tmpdir=${magnolia.home}/upload-tmp-dir
magnolia.bootstrap.dir=WEB-INF/bootstrap/author WEB-INF/bootstrap/common
magnolia.cache.startdir=cacheDir
magnolia.author.key.location=authorKey

jaas.config=classpath:/config/current-jaas.config

0 comments on commit 3f2e7da

Please sign in to comment.