Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BACKLOG-22223: Switch to auto-deploy for configuration #14

Merged
merged 1 commit into from
Jan 19, 2024
Merged

BACKLOG-22223: Switch to auto-deploy for configuration #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 2 additions & 36 deletions src/main/java/org/jahia/modules/richtext/configuration/RichTextConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.jahia.modules.richtext.configuration;

import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.jahia.api.settings.SettingsBean;
import org.jahia.modules.richtext.RichTextConfigurationInterface;
Expand All @@ -17,15 +16,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.Writer;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
Expand All @@ -37,18 +27,13 @@
}, immediate = true)
public class RichTextConfiguration implements RichTextConfigurationInterface, ManagedServiceFactory {

private static Logger logger = LoggerFactory.getLogger(RichTextConfiguration.class);
private static String CONFIG_FILE_NAME_BASE = "org.jahia.modules.richtext.config-";
private static String DEFAULT_CONFIG_FILE_NAME = CONFIG_FILE_NAME_BASE + DEFAULT_POLICY_KEY + ".yml";
private static final Logger logger = LoggerFactory.getLogger(RichTextConfiguration.class);
private static final String CONFIG_FILE_NAME_BASE = "org.jahia.modules.richtext.config-";
private Map<String, JSONObject> configs = new HashMap<>();
private Map<String, String> siteKeyToPid = new HashMap<>();
private BundleContext context;
private SettingsBean settingsBean = org.jahia.settings.SettingsBean.getInstance();

@Activate
public void activate(BundleContext context) {
this.context = context;
deployDefaultConfig();
logger.info("Activate RichTextConfiguration service");
}

Expand Down Expand Up @@ -173,23 +158,4 @@ private void mergeJsonObject(JSONObject target, JSONObject source) {
}
}
}

private void deployDefaultConfig() {
URL url = context.getBundle().getResource("META-INF/configuration-default/" + DEFAULT_CONFIG_FILE_NAME);
if (url != null) {
Path path = Paths.get(settingsBean.getJahiaVarDiskPath(), "karaf", "etc", DEFAULT_CONFIG_FILE_NAME);
if (!Files.exists(path)) {
try (InputStream input = url.openStream()) {
List<String> lines = IOUtils.readLines(input, StandardCharsets.UTF_8);
lines.add(0, "# This is default configuration provided by Jahia");
try (Writer w = new FileWriter(path.toFile())) {
IOUtils.writeLines(lines, null, w);
}
logger.info("Copied default richtext configuration to {}", path);
} catch (IOException e) {
logger.error("Unable to copy richtext configuration", e);
}
}
}
}
}
1 change: 1 addition & 0 deletions ...jahia.modules.richtext.config-default.yml → ...jahia.modules.richtext.config-default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# This is default configuration provided by Jahia
htmlFiltering:
htmlSanitizerDryRun: false
protocols:
Expand Down
Loading