X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FDeployConfig.java;h=b1e36633a1da9cd704d0e787e4fa8673a40d5c9d;hb=d9ff37f84e799028a1a0300850eccae77ced2024;hp=bff544ab23dbba6fc5bcdfcf4649d81d33237a41;hpb=e61a7a2dbff5e17fbf1c6c8bbd7fa687935d2897;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java index bff544ab2..b1e36633a 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java @@ -86,7 +86,7 @@ class DeployConfig implements ConfigurationListener { if (NodeConstants.NODE.equals(dataModel.getName())) continue dataModels; Dictionary config = InitUtils.getRepositoryConfig(dataModel.getName(), - getProps(NodeConstants.NODE_REPOS_FACTORY_PID, NodeConstants.NODE)); + getProps(NodeConstants.NODE_REPOS_FACTORY_PID, dataModel.getName())); if (config.size() != 0) putFactoryDeployConfig(NodeConstants.NODE_REPOS_FACTORY_PID, config); } @@ -122,9 +122,11 @@ class DeployConfig implements ConfigurationListener { // http server Dictionary webServerConfig = InitUtils .getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, NodeConstants.DEFAULT)); - if (!webServerConfig.isEmpty()) + if (!webServerConfig.isEmpty()) { + // TODO chekc for other customizers + webServerConfig.put("customizer.class", "org.argeo.equinox.jetty.CmsJettyCustomizer"); putFactoryDeployConfig(KernelConstants.JETTY_FACTORY_PID, webServerConfig); - + } save(); } @@ -245,7 +247,8 @@ class DeployConfig implements ConfigurationListener { try (Writer writer = Files.newBufferedWriter(deployConfigPath)) { new LdifWriter(writer).write(deployConfigs); } catch (IOException e) { - throw new CmsException("Cannot save deploy configs", e); + // throw new CmsException("Cannot save deploy configs", e); + log.error("Cannot save deploy configs", e); } }