[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10396] CMS-10396: fix NPEs in AutoExportModule with incorrect autoexport:modules configuration
Ate Douma pushed to branch bugfix/CMS-10396 at cms-community / hippo-cms
Commits:
0287f848 by Ate Douma at 2016-08-23T01:56:41+02:00
CMS-10396: fix NPEs in AutoExportModule with incorrect autoexport:modules
configuration
- - - - -
3 changed files:
-
automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/AutoExportModule.java
-
automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/EventProcessor.java
-
automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/Module.java
Changes:
=
automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/AutoExportModule.java
=
---
a/automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/AutoExportModule.java
+++
b/automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/AutoExportModule.java
@@ -63,8 +63,6 @@ public final class AutoExportModule implements DaemonModule {
} catch (Exception e) {
log.error("Failed to initialize auto export. Auto export will not
be available", e);
}
-
-processor.checkModules();
}
@Override
=
automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/EventProcessor.java
=
---
a/automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/EventProcessor.java
+++
b/automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/EventProcessor.java
@@ -123,24 +123,33 @@ public class EventProcessor implements EventListener {
String modulePath = entry.getKey();
Collection repositoryPaths = entry.getValue();
Module module = new Module(modulePath, repositoryPaths, baseDir,
registry, session, configuration);
-if (repositoryPaths.contains("/")) {
-defaultModule = module;
-} else {
-modules.add(module);
+if (module.check()) {
+if (repositoryPaths.contains("/")) {
+defaultModule = module;
+} else {
+modules.add(module);
+}
}
}
+if (defaultModule == null) {
+eventPreProcessor = null;
+manager = null;
+executor = null;
+uris = null;
+log.error("No valid Automatic export path configured: automatic
export will not be available");
+}
+else {
+executor = Executors.newSingleThreadScheduledExecutor();
+eventPreProcessor = new EventPreProcessor(session);
-executor = Executors.newSingleThreadScheduledExecutor();
-eventPreProcessor = new EventPreProcessor(session);
-
-// cache the registered namespace uris so we can detect it when any
were added
-String[] uris =
session.getWorkspace().getNamespaceRegistry().getURIs();
-this.uris = new HashSet(uris.length + 10);
-Collections.addAll(this.uris, uris);
-
-manager = session.getWorkspace().getObservationManager();
-manager.addEventListener(this, EVENT_TYPES, "/", true, null, null,
false);
+// cache the registered namespace uris so we can detect it when
any were added
+String[] uris =
session.getWorkspace().getNamespaceRegistry().getURIs();
+this.uris = new HashSet(uris.length + 10);
+Collections.addAll(this.uris, uris);
+manager = session.getWorkspace().getObservationManager();
+manager.addEventListener(this, EVENT_TYPES, "/", true, null, null,
false);
+}
}
@Override
@@ -381,11 +390,4 @@ public class EventProcessor implements EventListener {
defaultModule.getExporter().export();
defaultModule.getExtension().export();
}
-
-void checkModules() {
-defaultModule.check();
-for (Module module : modules) {
-module.check();
-}
-}
}
=
automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/Module.java
=
---
a/automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/Module.java
+++
b/automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/Module.java
@@ -84,9 +84,18 @@ final class Module {
return exclusionContext.isExcluded(path);
}
-void check() {
+boolean check() {
+if (exportDir.isFile()) {
+log.warn("Auto-export path {} is not a directory",
exportDir.getPath());
+return false;
+}
+if (!exportDir.exists()) {
+log.warn("Auto-export directory {} does not exist",
exportDir.getPath());
+return false;
+}
detectBrokenInitializeItems();
detectOrphanedFiles(exportDir, getBootstrapFiles());
+return true;
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10396
Ate Douma pushed new branch bugfix/CMS-10396 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/REPO-1552
Ate Douma deleted branch bugfix/REPO-1552 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/REPO-1552
Ate Douma pushed new branch bugfix/REPO-1552 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][release/2.26] REPO-1558: Simplify freemarker templates using output format directive
Ate Douma pushed to branch release/2.26 at cms-community / hippo-repository
Commits:
e25e791e by Ate Douma at 2016-08-22T23:07:32+02:00
REPO-1558: Simplify freemarker templates using output format directive
- - - - -
1 changed file:
- servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
Changes:
=
servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
=
---
a/servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
+++
b/servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
@@ -1,3 +1,4 @@
+<#ftl output_format="HTML">
<#--
Copyright 2014 Hippo B.V. (http://www.onehippo.com)
@@ -166,7 +167,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
<#assign childLink = "${childLink}[${child.index}]">
-${child.name?html}
+${child.name}
<#if child.hasProperty("hippo:count")>
[${child.getProperty("hippo:count").long}]
@@ -180,7 +181,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
[
<#list prop.values as value>
<#if value.type != 2>
- ${value.string!?html},
+ ${value.string!},
<#else>
${prop.length} bytes.
@@ -188,7 +189,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
]
<#else>
<#if prop.type != 2>
- ${prop.string!?html}
+ ${prop.string!}
<#else>
${prop.length} bytes.
@@ -204,9 +205,9 @@ ${response.setContentType("text/html;charset=UTF-8")}
<#if request.getParameter("xpath")??>
- ${request.getParameter("xpath")!?html}
+ ${request.getParameter("xpath")!}
<#else>
- ${request.getParameter("sql")!?html}
+ ${request.getParameter("sql")!}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/e25e791e463ae3e83e5f4be3b2d217b644a04a66
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][release/3.2] 2 commits: REPO-1557: bump to next project pom to be able to use freemarker 2.3.34
Ate Douma pushed to branch release/3.2 at cms-community / hippo-repository
Commits:
aaf9f6bd by Ate Douma at 2016-08-22T22:16:56+02:00
REPO-1557: bump to next project pom to be able to use freemarker 2.3.34
- - - - -
5e695112 by Ate Douma at 2016-08-22T22:17:58+02:00
REPO-1557: Simplify freemarker templates using output format directive
(cherry picked from commit 4d34f0d4c1baa61df2e2258a7d431223de102673)
- - - - -
4 changed files:
- pom.xml
- servlets/src/main/resources/org/hippoecm/repository/FormAuth-html.ftl
- servlets/src/main/resources/org/hippoecm/repository/LoggingServlet-html.ftl
- servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
Changes:
=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
org.onehippo.cms7
hippo-cms7-project
-27.6
+27.7-SNAPSHOT
Repository
=
servlets/src/main/resources/org/hippoecm/repository/FormAuth-html.ftl
=
--- a/servlets/src/main/resources/org/hippoecm/repository/FormAuth-html.ftl
+++ b/servlets/src/main/resources/org/hippoecm/repository/FormAuth-html.ftl
@@ -1,6 +1,7 @@
+<#ftl output_format="HTML">
<#--
- Copyright 2014 Hippo B.V. (http://www.onehippo.com)
+ Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
=
servlets/src/main/resources/org/hippoecm/repository/LoggingServlet-html.ftl
=
---
a/servlets/src/main/resources/org/hippoecm/repository/LoggingServlet-html.ftl
+++
b/servlets/src/main/resources/org/hippoecm/repository/LoggingServlet-html.ftl
@@ -1,6 +1,7 @@
+<#ftl output_format="HTML">
<#--
- Copyright 2014 Hippo B.V. (http://www.onehippo.com)
+ Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
=
servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
=
---
a/servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
+++
b/servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
@@ -1,3 +1,4 @@
+<#ftl output_format="HTML">
<#--
Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
@@ -182,7 +183,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
<#assign childLink = "${childLink}[${child.index}]">
-${child.name?html}
+${child.name}
<#if child.hasProperty("hippo:count")>
[${child.getProperty("hippo:count").long}]
@@ -196,7 +197,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
[
<#list prop.values as value>
<#if value.type != 2>
- ${value.string!?html},
+ ${value.string!},
<#else>
${prop.length} bytes.
@@ -204,7 +205,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
]
<#else>
<#if prop.type != 2>
- ${prop.string!?html}
+ ${prop.string!}
<#else>
${prop.length} bytes.
@@ -228,7 +229,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
SQL query:
-${originalQuery?html}
+${originalQuery}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/030e17fb4c799bf5276146c309805b5889e780f1...5e695112bb7a847d011f5c8bf58811b68d0dae2b
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype][release/3.2] ARCHE-506: [backport 10.2] Remove no longer functional example configuration of ā¦
Ate Douma pushed to branch release/3.2 at cms-community / hippo-project-archetype Commits: 46f23c60 by Ate Douma at 2016-08-22T22:08:29+02:00 ARCHE-506: [backport 10.2] Remove no longer functional example configuration of freemarker LoggerLibrary servlet init parameter - - - - - 1 changed file: - src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml Changes: = src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml = --- a/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml +++ b/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml @@ -129,16 +129,6 @@ -
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/7.9] CMS-10392 Update dependencies to use the latest snapshot if the related project has changes
Arent-Jan Banck pushed to branch release/7.9 at cms-community / hippo-cms-release Commits: 3b508dc7 by Arent-Jan Banck at 2016-08-22T21:36:53+02:00 CMS-10392 Update dependencies to use the latest snapshot if the related project has changes - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -40,19 +40,19 @@ - 1.13.06-SNAPSHOT + 1.13.06 2.26.13-SNAPSHOT 1.03.01 1.04.02 -2.26.27 +2.26.28-SNAPSHOT 1.01.01 -1.01.05 -2.28.14 + 1.01.06-SNAPSHOT +2.28.15-SNAPSHOT 2.26.01 7.9.13-SNAPSHOT 2.26.22-SNAPSHOT 1.04.03 -1.04.02 + 1.04.03-SNAPSHOT 1.04.01 1.03.01 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/3b508dc756dc98c2805927209854754a9f085dbd ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/7.9] CMS-10395 Bump hippo-packages to latest released version
Arent-Jan Banck pushed to branch release/7.9 at cms-community / hippo-cms-release Commits: fac1648b by Arent-Jan Banck at 2016-08-22T21:05:01+02:00 CMS-10395 Bump hippo-packages to latest released version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 1.01.01 1.01.05 2.28.14 -2.26.00 +2.26.01 7.9.13-SNAPSHOT 2.26.22-SNAPSHOT 1.04.03 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/fac1648ba90fef8d244b8fc99776ffcec3ca7eef ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-packages] Pushed new tag hippo-packages-2.26.01
Arent-Jan Banck pushed new tag hippo-packages-2.26.01 at cms-community / hippo-packages ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-packages][release/2.26] 2 commits: CMS-10395 prepare release hippo-packages-2.26.01
Arent-Jan Banck pushed to branch release/2.26 at cms-community / hippo-packages Commits: 92ea16f7 by Arent-Jan Banck at 2016-08-22T20:57:48+02:00 CMS-10395 prepare release hippo-packages-2.26.01 - - - - - 5776f91e by Arent-Jan Banck at 2016-08-22T21:01:32+02:00 CMS-10395 prepare for next development iteration - - - - - 3 changed files: - package-app-dependencies/pom.xml - package-cms-dependencies/pom.xml - pom.xml Changes: = package-app-dependencies/pom.xml = --- a/package-app-dependencies/pom.xml +++ b/package-app-dependencies/pom.xml @@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/7.9] CMS-10392 Bump hippo-cms-project version and use released version
Arent-Jan Banck pushed to branch release/7.9 at cms-community / hippo-cms-release Commits: f8f00c2c by Arent-Jan Banck at 2016-08-22T20:32:11+02:00 CMS-10392 Bump hippo-cms-project version and use released version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-cms7-project -26.9-SNAPSHOT +26.9 hippo-cms7-release View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/f8f00c2cb338145c114c1b24b70a483becde7058 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][release/2.26] REPO-1 Use released version of the project pom
Arent-Jan Banck pushed to branch release/2.26 at cms-community / hippo-repository Commits: d119c09c by Arent-Jan Banck at 2016-08-22T18:06:14+02:00 REPO-1 Use released version of the project pom - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-cms7-project -26.9-SNAPSHOT +26.9 Repository View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/d119c09c6328b2575f4752a40607aee852aa3bbf ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][release/2.28] HSTTWO-3772: [backport v7.9] Upgrade to Freemarker version 2.3.24
Ate Douma pushed to branch release/2.28 at cms-community / hippo-site-toolkit Commits: c052dfe7 by Ate Douma at 2016-08-22T17:35:46+02:00 HSTTWO-3772: [backport v7.9] Upgrade to Freemarker version 2.3.24 - use already just tagged version of project pom instead of next SNAPSHOT - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.onehippo.cms7 hippo-cms7-project -26.10-SNAPSHOT +26.9 Hippo Site Toolkit View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/c052dfe79627076c0a27bc758c50f1f274fe85d3 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/CMS-10322
Bert Leunis pushed new branch feature/CMS-10322 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Pushed new branch feature/delete-channel-HSTTWO-3774
Canh Ngo pushed new branch feature/delete-channel-HSTTWO-3774 at cms-community / hippo-site-toolkit ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][release/3.2] HSTTWO-3775: [backport v10.2] drop no longer functional nor needed setup of freemarker LoggerLibrary
Ate Douma pushed to branch release/3.2 at cms-community / hippo-site-toolkit
Commits:
f1076f85 by Ate Douma at 2016-08-22T16:47:32+02:00
HSTTWO-3775: [backport v10.2] drop no longer functional nor needed setup of
freemarker LoggerLibrary
cherry-picked from HSTTWO-3723
- - - - -
2 changed files:
- client/src/main/java/org/hippoecm/hst/servlet/HstFreemarkerServlet.java
- pom.xml
Changes:
=
client/src/main/java/org/hippoecm/hst/servlet/HstFreemarkerServlet.java
=
--- a/client/src/main/java/org/hippoecm/hst/servlet/HstFreemarkerServlet.java
+++ b/client/src/main/java/org/hippoecm/hst/servlet/HstFreemarkerServlet.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com)
+q * Copyright 2009-2016 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -59,6 +59,10 @@ import static
org.hippoecm.hst.core.container.ContainerConstants.FREEMARKER_WEB_
public class HstFreemarkerServlet extends FreemarkerServlet {
+/**
+ * @deprecated HSTTWO-3723: no longer functional and ignored
servlet/context init parameter
+ */
+@Deprecated
public static final String INIT_PARAM_LOGGER_LIBRARY = "loggerLibrary";
private static final Logger log =
LoggerFactory.getLogger(HstFreemarkerServlet.class);
@@ -82,8 +86,6 @@ public class HstFreemarkerServlet extends FreemarkerServlet {
public void init(final ServletConfig config) throws ServletException {
super.init(config);
-configureLoggerLibrary();
-
Configuration conf = super.getConfiguration();
if (!hasInitParameter(Configurable.TEMPLATE_EXCEPTION_HANDLER_KEY)) {
@@ -140,44 +142,11 @@ public class HstFreemarkerServlet extends
FreemarkerServlet {
final String projectBaseDir =
System.getProperty(PROJECT_BASEDIR_PROPERTY);
if (projectBaseDir != null) {
log.info("Setting freemarker template update delay to '0ms' since
running locally");
-conf.setTemplateUpdateDelay(0);
+conf.setTemplateUpdateDelayMilliseconds(0);
}
conf.setLocalizedLookup(false);
}
-private void configureLoggerLibrary() {
-final int loggerLibrary = getLoggerLibrary();
-try {
-log.info("Using freemarker.log.Logger library '{}'",
loggerLibrary);
-freemarker.log.Logger.selectLoggerLibrary(loggerLibrary);
-} catch (ClassNotFoundException e) {
-log.warn("Failed to enable logging with freemarker.log.Logger
library '{}'", loggerLibrary, e);
-}
-}
-
-private int getLoggerLibrary() {
-if (!hasInitParameter(INIT_PARAM_LOGGER_LIBRARY)) {
-return freemarker.log.Logger.LIBRARY_NONE;
-}
-
-final String initParamValue =
getInitParameter(INIT_PARAM_LOGGER_LIBRARY);
-switch (initParamValue) {
-case "auto": return freemarker.log.Logger.LIBRARY_AUTO;
-case "none": return freemarker.log.Logger.LIBRARY_NONE;
-case "java": return freemarker.log.Logger.LIBRARY_JAVA;
-case "avalon": return freemarker.log.Logger.LIBRARY_AVALON;
-case "log4j": return freemarker.log.Logger.LIBRARY_LOG4J;
-case "commons": return freemarker.log.Logger.LIBRARY_COMMONS;
-case "slf4j": return freemarker.log.Logger.LIBRARY_SLF4J;
-default:
-log.warn("HstFreemarkerServlet has invalid value for init
param '{}': '{}'." +
-" Valid values are 'auto', 'none' (the default),
'java', 'avalon', 'log4j', 'commons', and 'slf4j'. " +
-" Using 'none' instead'.",
-INIT_PARAM_LOGGER_LIBRARY, initParamValue);
-return freemarker.log.Logger.LIBRARY_NONE;
-}
-}
-
@Override
public void doGet(final HttpServletRequest request, final
HttpServletResponse response) throws ServletException, IOException {
try {
=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
org.onehippo.cms7
hippo-cms7-project
-27.5
+27.7-SNAPSHOT
Hippo Site Toolkit
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/f1076f85e4747fa77818a793b59176fe36f842f5
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/delete-channel-HSTTWO-3773] HSTTWO-3773 Extend and fix unit test
Tobias Jeger pushed to branch feature/delete-channel-HSTTWO-3773 at
cms-community / hippo-site-toolkit
Commits:
b5421a02 by Tobias Jeger at 2016-08-22T16:23:13+02:00
HSTTWO-3773 Extend and fix unit test
- - - - -
1 changed file:
-
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidatorTest.java
Changes:
=
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidatorTest.java
=
---
a/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidatorTest.java
+++
b/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidatorTest.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import org.hippoecm.hst.configuration.channel.Channel;
import org.hippoecm.hst.configuration.hosting.Mount;
import org.hippoecm.hst.pagecomposer.jaxrs.services.exceptions.ClientError;
import org.hippoecm.hst.pagecomposer.jaxrs.services.exceptions.ClientException;
@@ -57,20 +58,32 @@ public class HasNoChildMountNodeValidatorTest {
}
@Test(expected = ClientException.class)
-public void has_exception_when_validating_mount_with_children_mounts()
throws Exception {
-final List childrenMounts = new ArrayList<>();
-final Mount childMount = createMock(Mount.class);
-childrenMounts.add(childMount);
+public void has_exception_when_validating_mount_with_child_mounts() throws
Exception {
+final List childMounts = new ArrayList<>();
+final Mount childMountA = createMock(Mount.class);
+final Mount childMountB = createMock(Mount.class);
+final Mount childMountC = createMock(Mount.class);
+childMounts.add(childMountA);
+childMounts.add(childMountB);
+childMounts.add(childMountC);
+final Channel channel = createMock(Channel.class);
-expect(mountFoo.getChildMounts()).andReturn(childrenMounts).anyTimes();
-expect(mountBah.getChildMounts()).andReturn(Collections.emptyList());
+expect(mountFoo.getChildMounts()).andReturn(childMounts).anyTimes();
+expect(mountFoo.getChannel()).andReturn(channel).anyTimes();
+
expect(mountBah.getChildMounts()).andReturn(Collections.emptyList()).anyTimes();
+expect(channel.getName()).andReturn("foo").anyTimes();
+expect(childMountA.getMountPath()).andReturn("/a").anyTimes();
+expect(childMountB.getMountPath()).andReturn("/b").anyTimes();
+expect(childMountC.getMountPath()).andReturn("/a").anyTimes();
-replay(mountFoo, mountBah);
+replay(mountFoo, mountBah, channel, childMountA, childMountB,
childMountC);
try {
validator.validate(null);
} catch (ClientException e) {
assertThat(e.getError(), is(ClientError.CHILD_MOUNT_EXISTS));
+assertThat(e.getParameterMap().get("channel"), is("foo"));
+assertThat(e.getParameterMap().get("childMountList"), is("/a,
/b"));
throw e;
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/b5421a02db8b850e7a024f770cc2672b8a56432e
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/delete-channel] 5 commits: HSTTWO-3773 Extend validator for better error feedback
Tobias Jeger pushed to branch feature/delete-channel at cms-community /
hippo-site-toolkit
Commits:
4575ee8f by Tobias Jeger at 2016-08-22T12:19:44+02:00
HSTTWO-3773 Extend validator for better error feedback
- - - - -
68e0b567 by Mathijs den Burger at 2016-08-22T16:05:36+02:00
HSTTWO-3773 Mention child mounts with the same path only once
Its likely that in each host group a channel will have the same
child mount paths. Reporting those identical mount paths multiple
times in the UI is unnecessary, so filter out duplicates by
putting them in a set.
- - - - -
b5421a02 by Tobias Jeger at 2016-08-22T16:23:13+02:00
HSTTWO-3773 Extend and fix unit test
- - - - -
1b466c34 by Tobias Jeger at 2016-08-22T16:27:15+02:00
HSTTWO-3773 Make unit test more compact
- - - - -
1beba535 by Tobias Jeger at 2016-08-22T16:27:43+02:00
HSTTWO-3773 Reintegrate feature/delete-channel-HSTTWO-3773 into
feature/delete-channel
- - - - -
2 changed files:
-
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidator.java
-
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidatorTest.java
Changes:
=
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidator.java
=
---
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidator.java
+++
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidator.java
@@ -16,8 +16,13 @@
package org.hippoecm.hst.pagecomposer.jaxrs.services.validators;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.hippoecm.hst.configuration.hosting.Mount;
import org.hippoecm.hst.core.request.HstRequestContext;
import org.hippoecm.hst.pagecomposer.jaxrs.services.exceptions.ClientError;
@@ -40,7 +45,18 @@ public class HasNoChildMountNodeValidator implements
Validator {
.anyMatch(mount -> !mount.getChildMounts().isEmpty());
if (hasMountWithChildren) {
-throw new ClientException("Child mount exists",
ClientError.CHILD_MOUNT_EXISTS);
+final Map parameterMap = new HashMap<>();
+final Set mountChildren = new LinkedHashSet<>();
+
+mounts.stream().forEach(mount -> {
+for (Mount child : mount.getChildMounts()) {
+mountChildren.add(child.getMountPath());
+}
+});
+parameterMap.put("childMountList", StringUtils.join(mountChildren,
", "));
+parameterMap.put("channel", mounts.get(0).getChannel().getName());
+
+throw new ClientException("Child mount exists",
ClientError.CHILD_MOUNT_EXISTS, parameterMap);
}
}
}
=
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidatorTest.java
=
---
a/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidatorTest.java
+++
b/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidatorTest.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import org.hippoecm.hst.configuration.channel.Channel;
import org.hippoecm.hst.configuration.hosting.Mount;
import org.hippoecm.hst.pagecomposer.jaxrs.services.exceptions.ClientError;
import org.hippoecm.hst.pagecomposer.jaxrs.services.exceptions.ClientException;
@@ -57,20 +58,29 @@ public class HasNoChildMountNodeValidatorTest {
}
@Test(expected = ClientException.class)
-public void has_exception_when_validating_mount_with_children_mounts()
throws Exception {
-final List childrenMounts = new ArrayList<>();
-final Mount childMount = createMock(Mount.class);
-childrenMounts.add(childMount);
+public void has_exception_when_validating_mount_with_child_mounts() throws
Exception {
+final Mount childMountA = createMock(Mount.class);
+final Mount childMountB = createMock(Mount.class);
+final Mount childMountC = createMock(Mount.class);
+final List childMounts = Arrays.asList(childMountA,
childMountB, childMountC);
+final Channel channel = createMock(Channel.class);
-expect(mountFoo.getChildMounts()).andReturn(childrenMounts).anyTimes();
-expect(mountBah.getChildMounts()).andReturn(Collections.emptyList());
+
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Deleted branch feature/delete-channel-HSTTWO-3773
Tobias Jeger deleted branch feature/delete-channel-HSTTWO-3773 at cms-community / hippo-site-toolkit ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/10.2] CMS-10375: update to latest cms7-project pom to use freemarker 2.3.24
Ate Douma pushed to branch release/10.2 at cms-community / hippo-cms-release Commits: a9d8d629 by Ate Douma at 2016-08-22T16:28:30+02:00 CMS-10375: update to latest cms7-project pom to use freemarker 2.3.24 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-cms7-project -27.6 +27.7-SNAPSHOT hippo-cms7-release View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/a9d8d62918748551757d4eb097941d8adbff99e9 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/delete-channel-HSTTWO-3773] HSTTWO-3773 Make unit test more compact
Tobias Jeger pushed to branch feature/delete-channel-HSTTWO-3773 at
cms-community / hippo-site-toolkit
Commits:
1b466c34 by Tobias Jeger at 2016-08-22T16:27:15+02:00
HSTTWO-3773 Make unit test more compact
- - - - -
1 changed file:
-
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidatorTest.java
Changes:
=
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidatorTest.java
=
---
a/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidatorTest.java
+++
b/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidatorTest.java
@@ -59,13 +59,10 @@ public class HasNoChildMountNodeValidatorTest {
@Test(expected = ClientException.class)
public void has_exception_when_validating_mount_with_child_mounts() throws
Exception {
-final List childMounts = new ArrayList<>();
final Mount childMountA = createMock(Mount.class);
final Mount childMountB = createMock(Mount.class);
final Mount childMountC = createMock(Mount.class);
-childMounts.add(childMountA);
-childMounts.add(childMountB);
-childMounts.add(childMountC);
+final List childMounts = Arrays.asList(childMountA,
childMountB, childMountC);
final Channel channel = createMock(Channel.class);
expect(mountFoo.getChildMounts()).andReturn(childMounts).anyTimes();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/1b466c34f8bce0432dd2a04e02015d4bfe4047fd
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/delete-channel-HSTTWO-3773] HSTTWO-3773 Mention child mounts with the same path only once
Mathijs den Burger pushed to branch feature/delete-channel-HSTTWO-3773 at
cms-community / hippo-site-toolkit
Commits:
68e0b567 by Mathijs den Burger at 2016-08-22T16:05:36+02:00
HSTTWO-3773 Mention child mounts with the same path only once
Its likely that in each host group a channel will have the same
child mount paths. Reporting those identical mount paths multiple
times in the UI is unnecessary, so filter out duplicates by
putting them in a set.
- - - - -
1 changed file:
-
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidator.java
Changes:
=
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidator.java
=
---
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidator.java
+++
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/HasNoChildMountNodeValidator.java
@@ -16,10 +16,11 @@
package org.hippoecm.hst.pagecomposer.jaxrs.services.validators;
-import java.util.ArrayList;
import java.util.HashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.hippoecm.hst.configuration.hosting.Mount;
@@ -45,7 +46,7 @@ public class HasNoChildMountNodeValidator implements
Validator {
if (hasMountWithChildren) {
final Map parameterMap = new HashMap<>();
-final List mountChildren = new ArrayList<>();
+final Set mountChildren = new LinkedHashSet<>();
mounts.stream().forEach(mount -> {
for (Mount child : mount.getChildMounts()) {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/68e0b5674c268e6da86c90b072c67161669a4453
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/delete-channel-CHANNELMGR-798
Mathijs den Burger deleted branch feature/delete-channel-CHANNELMGR-798 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/delete-channel-CHANNELMGR-798] 2 commits: CHANNELMGR-798 Remove unused return
Mathijs den Burger pushed to branch feature/delete-channel-CHANNELMGR-798 at
cms-community / hippo-addon-channel-manager
Commits:
13d8fc41 by Mathijs den Burger at 2016-08-22T15:51:10+02:00
CHANNELMGR-798 Remove unused return
- - - - -
26fca2c8 by Mathijs den Burger at 2016-08-22T15:57:43+02:00
CHANNELMGR-798 Split test for error codes in two
One test for ExtResponse errors and another for ErrorStatus errors.
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/actions/channelActions.controller.js
- frontend-ng/src/angularjs/utils/feedback.service.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/actions/channelActions.controller.js
=
--- a/frontend-ng/src/angularjs/channel/actions/channelActions.controller.js
+++ b/frontend-ng/src/angularjs/channel/actions/channelActions.controller.js
@@ -95,6 +95,6 @@ export class ChannelActionsCtrl {
.textContent(this.$translate.instant(key, response.parameterMap))
.ok(this.$translate.instant('OK'));
-return this.DialogService.show(confirm);
+this.DialogService.show(confirm);
}
}
=
frontend-ng/src/angularjs/utils/feedback.service.spec.js
=
--- a/frontend-ng/src/angularjs/utils/feedback.service.spec.js
+++ b/frontend-ng/src/angularjs/utils/feedback.service.spec.js
@@ -105,7 +105,7 @@ describe('FeedbackService', () => {
expect($log.info).toHaveBeenCalledWith('another message');
});
- it('maps error codes using the error map', () => {
+ it('maps ExtResponse error codes using the error map', () => {
const map = { a: 'A' };
const response = { errorCode: 'a' };
FeedbackService.showErrorResponseOnSubpage(response, 'defaultKey', map);
@@ -124,17 +124,20 @@ describe('FeedbackService', () => {
$translate.instant.calls.reset();
FeedbackService.showErrorResponse(response, 'defaultKey', map);
expect($translate.instant).toHaveBeenCalledWith('defaultKey', params);
+ });
-// test an ErrorStatus response i.s.o. an ExtResponse.
-delete response.data;
-delete response.errorCode;
-response.error = 'a';
-$translate.instant.calls.reset();
+ it('maps ErrorStatus error codes using the error map', () => {
+const map = { a: 'A' };
+const response = {
+ error: 'a',
+};
FeedbackService.showErrorResponse(response, 'defaultKey', map);
expect($translate.instant).toHaveBeenCalledWith('A', undefined);
+const params = { trans: 'parent' };
response.parameterMap = params;
response.error = 'c';
+$translate.instant.calls.reset();
FeedbackService.showErrorResponse(response, 'defaultKey', map);
expect($translate.instant).toHaveBeenCalledWith('defaultKey', params);
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/1ee719b8b5ae210bee041515d4246e3962f2a097...26fca2c8e8c572df062b7f9b5268ec054f53eb59
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][bugfix/HIPPLUG-1344] HIPPLUG-1344 Update demo after method deprecation
Arthur Bogaart pushed to branch bugfix/HIPPLUG-1344 at cms-community /
hippo-plugin-taxonomy
Commits:
ae56246e by Arthur Bogaart at 2016-08-22T15:53:01+02:00
HIPPLUG-1344 Update demo after method deprecation
- - - - -
1 changed file:
-
demo/plugin/src/main/java/org/onehippo/taxonomy/demo/plugin/AdditionalFieldCustomTaxonomyPickerPlugin.java
Changes:
=
demo/plugin/src/main/java/org/onehippo/taxonomy/demo/plugin/AdditionalFieldCustomTaxonomyPickerPlugin.java
=
---
a/demo/plugin/src/main/java/org/onehippo/taxonomy/demo/plugin/AdditionalFieldCustomTaxonomyPickerPlugin.java
+++
b/demo/plugin/src/main/java/org/onehippo/taxonomy/demo/plugin/AdditionalFieldCustomTaxonomyPickerPlugin.java
@@ -29,7 +29,8 @@ public class AdditionalFieldCustomTaxonomyPickerPlugin
extends TaxonomyPickerPlu
}
@Override
-protected Dialog createPickerDialog(ClassificationModel
model, String preferredLocale) {
+protected Dialog createTaxonomyPickerDialog(final
ClassificationModel model,
+final String
preferredLocale) {
return new
AdditionalFieldCustomTaxonomyPickerDialog(getPluginContext(),
getPluginConfig(), model, preferredLocale);
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/ae56246ee7c13918d350069800bb388c96f01e05
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/nps-psp1
Tobias Jeger deleted branch feature/nps-psp1 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 6 commits: CMS-10298 Set nps-psp1 development version
Tobias Jeger pushed to branch master at cms-community / hippo-cms Commits: 215c5025 by Mathijs den Burger at 2016-07-27T09:24:49+02:00 CMS-10298 Set nps-psp1 development version - - - - - 53e57827 by Canh Ngo at 2016-07-27T09:54:11+02:00 CMS-10281 Generate unique user-id for usage-statistics script - Unique user-id is the hash value of username and hostname - Current language is also sent to usage-statistics script. - - - - - 742d54bb by Mathijs den Burger at 2016-07-27T09:58:30+02:00 CMS-10281 Bump copyright year - - - - - c3c77515 by Mathijs den Burger at 2016-07-27T09:58:50+02:00 CMS-10281 Reintegrate feature/CMS-10281 - - - - - 3ea016b7 by Mathijs den Burger at 2016-08-19T15:37:18+02:00 CMS-10380 Revert unique user ID generation Its not needed by the cms-usage-statistics.js script after all. - - - - - 07e1490f by Tobias Jeger at 2016-08-22T15:51:19+02:00 CMS-10298 Reintegrate feature/nps-psp1 into master - - - - - 30 changed files: - api/pom.xml - api/src/main/java/org/hippoecm/frontend/usagestatistics/UsageStatisticsHeaderItem.java - api/src/main/java/org/hippoecm/frontend/usagestatistics/UsageStatisticsUtils.java - api/src/main/resources/org/hippoecm/frontend/usagestatistics/usage-statistics.js - automatic-export/frontend/pom.xml - automatic-export/pom.xml - automatic-export/repository/pom.xml - brokenlinks/common/pom.xml - brokenlinks/frontend/pom.xml - brokenlinks/pom.xml - brokenlinks/repository/pom.xml - brokenlinks/test/pom.xml - builtin/pom.xml - config/pom.xml - console/frontend/pom.xml - console/pom.xml - console/repository/pom.xml - dependencies/pom.xml - editor/common/pom.xml - editor/frontend/pom.xml - editor/pom.xml - editor/repository/pom.xml - editor/test/pom.xml - engine/pom.xml - gallery/frontend/pom.xml - gallery/pom.xml - gallery/repository/pom.xml - google-analytics/frontend/pom.xml - google-analytics/pom.xml - gotolink/pom.xml The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/d259d9bea55e4cb5e71149019f2d74af154813f0...07e1490f78137887132e2ed26fd159cf22b0b4e9 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-packages][release/2.26] CMS-16 Update dependencies to match latest maintenance release
Arent-Jan Banck pushed to branch release/2.26 at cms-community / hippo-packages Commits: fce678a3 by Arent-Jan Banck at 2016-08-22T15:49:47+02:00 CMS-16 Update dependencies to match latest maintenance release - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ Hippo CMS7 Product Packages -1.03.00 -2.26.00 -2.26.00 -2.28.00 +1.03.01 +2.26.21 +2.26.27 +2.28.14 2.4 View it on GitLab: https://code.onehippo.org/cms-community/hippo-packages/commit/fce678a3db849f2d0e86f740a07bb673b17ad165 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-2747
Ate Douma deleted branch bugfix/CMS-2747 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] CMS-2747 removed unused feedback code
Ate Douma pushed to branch master at cms-community / hippo-cms
Commits:
d259d9be by Jasper Floor at 2016-08-22T15:47:42+02:00
CMS-2747 removed unused feedback code
- - - - -
1 changed file:
-
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/EditingWorkflowPlugin.java
Changes:
=
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/EditingWorkflowPlugin.java
=
---
a/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/EditingWorkflowPlugin.java
+++
b/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/EditingWorkflowPlugin.java
@@ -63,12 +63,6 @@ public class EditingWorkflowPlugin extends
AbstractDocumentWorkflowPlugin {
IEditor editor = editorMgr.getEditor(new
JcrNodeModel(getModel().getNode()));
editor.save();
-if (getPluginConfig().getAsBoolean("feedback.enabled", false))
{
-final DateFormat dateFormat =
DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-final IModel msg = new
StringResourceModel("saved", EditingWorkflowPlugin.this, null, null,
-dateFormat.format(new Date()));
-info(msg.getObject());
-}
return null;
}
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/d259d9bea55e4cb5e71149019f2d74af154813f0
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][bugfix/HIPPLUG-1344] HIPPLUG-1344 Deprecate createPickerDialog
Arthur Bogaart pushed to branch bugfix/HIPPLUG-1344 at cms-community /
hippo-plugin-taxonomy
Commits:
830a497f by Arthur Bogaart at 2016-08-22T15:46:07+02:00
HIPPLUG-1344 Deprecate createPickerDialog
Instead of breaking the API we deprecate #createPickerDialog and java-doc it
- - - - -
1 changed file:
-
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyPickerPlugin.java
Changes:
=
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyPickerPlugin.java
=
---
a/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyPickerPlugin.java
+++
b/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyPickerPlugin.java
@@ -40,6 +40,7 @@ import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.util.io.IClusterable;
import org.hippoecm.frontend.PluginRequestTarget;
+import org.hippoecm.frontend.dialog.AbstractDialog;
import org.hippoecm.frontend.dialog.Dialog;
import org.hippoecm.frontend.dialog.DialogLink;
import org.hippoecm.frontend.dialog.IDialogFactory;
@@ -185,7 +186,15 @@ public class TaxonomyPickerPlugin extends
RenderPlugin {
if (dao != null && mode == Mode.EDIT) {
add(new CategoryListView("keys"));
final ClassificationModel model = new ClassificationModel(dao,
getModel());
-final IDialogFactory dialogFactory = () ->
createPickerDialog(model, getPreferredLocale());
+final IDialogFactory dialogFactory = () -> {
+final String locale = getPreferredLocale();
+@SuppressWarnings("deprecation")
+AbstractDialog dialog = createPickerDialog(model, locale);
+if (dialog == null) {
+dialog = createTaxonomyPickerDialog(model, locale);
+}
+return dialog;
+};
final DialogLink dialogLink = new DialogLink("edit", new
ResourceModel("edit"), dialogFactory, getDialogService());
add(dialogLink);
setEnabled(getTaxonomy() != null);
@@ -275,13 +284,23 @@ public class TaxonomyPickerPlugin extends
RenderPlugin {
}
/**
+ * @deprecated This method is deprecated in favor of {@link
#createTaxonomyPickerDialog} and will be removed in
+ * version 12.00 and onward.
+ */
+@Deprecated
+protected AbstractDialog
createPickerDialog(ClassificationModel model, String preferredLocale) {
+return null;
+}
+
+/**
* Creates and returns taxonomy picker dialog instance.
*
* If you want to provide a custom taxonomy picker plugin, you might want
to
* override this method.
*
*/
-protected Dialog createPickerDialog(ClassificationModel
model, String preferredLocale) {
+protected Dialog createTaxonomyPickerDialog(final
ClassificationModel model,
+final String
preferredLocale) {
return new TaxonomyPickerDialog(getPluginContext(), getPluginConfig(),
model, preferredLocale);
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/830a497fcb01c3f1cc62169a56fcdf708e64102a
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][release/4.0] REPO-1556 [Backport 4.0] Make sure the upgrade script runs much faster because iā¦
Ard Schrijvers pushed to branch release/4.0 at cms-community / hippo-repository
Commits:
32e77d20 by Ard Schrijvers at 2016-08-22T15:19:25+02:00
REPO-1556 [Backport 4.0] Make sure the upgrade script runs much faster because
it will take too long in production
Make batchsize 10 times bigger and throttle 10 times slower
(cherry picked from commit 703800a402998af32925030db3c639d4d50821ac)
- - - - -
1 changed file:
- upgrade/src/main/resources/hippo-translation-to-display-name-updater.xml
Changes:
=
upgrade/src/main/resources/hippo-translation-to-display-name-updater.xml
=
--- a/upgrade/src/main/resources/hippo-translation-to-display-name-updater.xml
+++ b/upgrade/src/main/resources/hippo-translation-to-display-name-updater.xml
@@ -19,7 +19,7 @@
hipposys:updaterinfo
-10
+100
Changes the way display names of documents and folders are
stored from the old model based on hippo:translated node type to the new model
based on hippo:named node type. Run this updater after upgrading to Hippo
11.
@@ -104,7 +104,7 @@ class UpdaterTemplate extends BaseNodeUpdateVisitor {
}
-1000
+100
hippo:translated
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/32e77d2004d2f2727bf60e1fa382cec8de25fc4d
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][master] REPO-1555 Make sure the upgrade script runs much faster because it will take too long in production
Ard Schrijvers pushed to branch master at cms-community / hippo-repository
Commits:
703800a4 by Ard Schrijvers at 2016-08-22T15:18:56+02:00
REPO-1555 Make sure the upgrade script runs much faster because it will take
too long in production
Make batchsize 10 times bigger and throttle 10 times slower
- - - - -
1 changed file:
- upgrade/src/main/resources/hippo-translation-to-display-name-updater.xml
Changes:
=
upgrade/src/main/resources/hippo-translation-to-display-name-updater.xml
=
--- a/upgrade/src/main/resources/hippo-translation-to-display-name-updater.xml
+++ b/upgrade/src/main/resources/hippo-translation-to-display-name-updater.xml
@@ -19,7 +19,7 @@
hipposys:updaterinfo
-10
+100
Changes the way display names of documents and folders are
stored from the old model based on hippo:translated node type to the new model
based on hippo:named node type. Run this updater after upgrading to Hippo
11.
@@ -104,7 +104,7 @@ class UpdaterTemplate extends BaseNodeUpdateVisitor {
}
-1000
+100
hippo:translated
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/703800a402998af32925030db3c639d4d50821ac
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10385
Ard Schrijvers deleted branch bugfix/CMS-10385 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-project][release/7.9] 2 commits: CMS-10392 prepare release hippo-cms7-project-26.9
Arent-Jan Banck pushed to branch release/7.9 at cms-community / hippo-cms-project Commits: 02e4557e by Arent-Jan Banck at 2016-08-22T14:58:17+02:00 CMS-10392 prepare release hippo-cms7-project-26.9 - - - - - 8c8d7b68 by Arent-Jan Banck at 2016-08-22T14:59:12+02:00 CMS-10392 prepare for next development iteration - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.onehippo.cms7 hippo-cms7-project - 26.9-SNAPSHOT + 26.10-SNAPSHOT Hippo CMS7 Project POM Hippo CMS7 Project POM View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-project/compare/138401792ec33b156b5c197f253865152e47bef5...8c8d7b68d6bb8f48421c050c02bd23d9e5c1b354 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-project] Pushed new tag hippo-cms7-project-26.9
Arent-Jan Banck pushed new tag hippo-cms7-project-26.9 at cms-community / hippo-cms-project ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-project][release/7.9] CMS-10376 [backport v7.9] Upgrade freemarker version to 2.3.24
Ate Douma pushed to branch release/7.9 at cms-community / hippo-cms-project Commits: 13840179 by Ate Douma at 2016-08-22T13:42:29+02:00 CMS-10376 [backport v7.9] Upgrade freemarker version to 2.3.24 (cherry picked from commit 7002af88d727b7581e1dbcd7a5bd1c1ad25edeae) - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 1.9.13 3.2.12.RELEASE 2.3.0 -2.3.22 +2.3.24-incubating View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-project/commit/138401792ec33b156b5c197f253865152e47bef5 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-project][release/10] CMS-10375 [backport v10] Upgrade freemarker version to 2.3.24
Ate Douma pushed to branch release/10 at cms-community / hippo-cms-project Commits: 1920d450 by Ard Schrijvers at 2016-08-22T13:34:09+02:00 CMS-10375 [backport v10] Upgrade freemarker version to 2.3.24 (cherry picked from commit 7002af88d727b7581e1dbcd7a5bd1c1ad25edeae) - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 4.1.4.RELEASE 1.8.4 2.3.0 -2.3.22 +2.3.24-incubating 2.10.1 2.10.1-h12 1.3 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-project/commit/1920d450f5e8e374a8a04a6540662984180fd84c ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations] Pushed new tag hippo-community-translations-11.0.1-rc-1
Arent-Jan Banck pushed new tag hippo-community-translations-11.0.1-rc-1 at cms-community / hippo-cms-translations ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-seo-support] Pushed new tag hippo-plugin-seo-support-root-3.0.1-rc-1
Arent-Jan Banck pushed new tag hippo-plugin-seo-support-root-3.0.1-rc-1 at cms-community / hippo-plugin-seo-support ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/delete-channel-CHANNELMGR-798
Tobias Jeger pushed new branch feature/delete-channel-CHANNELMGR-798 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype] Pushed new tag hippo-project-archetype-4.0.1-rc-1
Arent-Jan Banck pushed new tag hippo-project-archetype-4.0.1-rc-1 at cms-community / hippo-project-archetype ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-selections][release/4.0] HIPPLUG-1375 [Backport 4.0] first check whether the item exists : If not, don't use the compare view
Ard Schrijvers pushed to branch release/4.0 at cms-community /
hippo-plugin-selections
Commits:
b6f40260 by Ard Schrijvers at 2016-08-22T12:03:53+02:00
HIPPLUG-1375 [Backport 4.0] first check whether the item exists : If not,
dont use the compare view
(cherry picked from commit 435ce166782b88859c5b269cae33d3f78693f3e0)
- - - - -
1 changed file:
-
addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
Changes:
=
addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
=
---
a/addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
+++
b/addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
@@ -23,6 +23,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Set;
+import javax.jcr.RepositoryException;
+
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
@@ -69,6 +71,7 @@ import org.hippoecm.frontend.validation.IValidationResult;
import org.hippoecm.frontend.validation.ModelPath;
import org.hippoecm.frontend.validation.ModelPathElement;
import org.hippoecm.frontend.validation.Violation;
+import org.hippoecm.repository.util.JcrUtils;
import org.onehippo.forge.selection.frontend.model.ValueList;
import org.onehippo.forge.selection.frontend.plugin.sorting.SortHelper;
import org.onehippo.forge.selection.frontend.provider.IValueListProvider;
@@ -281,16 +284,24 @@ public class DynamicMultiSelectPlugin extends
RenderPlugin {
JcrNodeModel baseNodeModel = (JcrNodeModel)compareToRef.getModel();
if (baseNodeModel != null && baseNodeModel.getNode() != null) {
IFieldDescriptor field = helper.getField();
-JcrMultiPropertyValueModel baseModel = new
JcrMultiPropertyValueModel<>(new JcrItemModel(
-baseNodeModel.getItemModel().getPath() + '/' +
field.getPath()));
-
-List baseOptions = baseModel.getObject();
-List currentOptions = model.getObject();
-List changes =
LCS.getChangeSet(baseOptions.toArray(new String[baseOptions.size()]),
-currentOptions.toArray(new
String[currentOptions.size()]));
+try {
+if
(baseNodeModel.getNode().getSession().itemExists(baseNodeModel.getItemModel().getPath()
+ '/' + field.getPath())) {
+JcrMultiPropertyValueModel baseModel = new
JcrMultiPropertyValueModel<>(new JcrItemModel(
+baseNodeModel.getItemModel().getPath() + '/' +
field.getPath()));
+
+List baseOptions = baseModel.getObject();
+List currentOptions = model.getObject();
+List changes =
LCS.getChangeSet(baseOptions.toArray(new String[baseOptions.size()]),
+currentOptions.toArray(new
String[currentOptions.size()]));
+// show view list
+modeFragment.add(new CompareView("viewitems", changes,
valueList));
+} else {
+modeFragment.add(new ListView("viewitems",
model.getObject(), valueList));
+}
+} catch (RepositoryException e) {
+log.error("RepositoryException : ", e);
+}
-// show view list
-modeFragment.add(new CompareView("viewitems", changes,
valueList));
} else {
modeFragment.add(new ListView("viewitems", model.getObject(),
valueList));
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-selections/commit/b6f40260de286750fbbe5dff2907e9cb53d51aa5
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-selections][master] HIPPLUG-1376 first check whether the item exists : If not, don't use the compare view
Ard Schrijvers pushed to branch master at cms-community /
hippo-plugin-selections
Commits:
435ce166 by Ard Schrijvers at 2016-08-22T12:00:49+02:00
HIPPLUG-1376 first check whether the item exists : If not, dont use the
compare view
- - - - -
1 changed file:
-
addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
Changes:
=
addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
=
---
a/addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
+++
b/addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
@@ -23,6 +23,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Set;
+import javax.jcr.RepositoryException;
+
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
@@ -69,6 +71,7 @@ import org.hippoecm.frontend.validation.IValidationResult;
import org.hippoecm.frontend.validation.ModelPath;
import org.hippoecm.frontend.validation.ModelPathElement;
import org.hippoecm.frontend.validation.Violation;
+import org.hippoecm.repository.util.JcrUtils;
import org.onehippo.forge.selection.frontend.model.ValueList;
import org.onehippo.forge.selection.frontend.plugin.sorting.SortHelper;
import org.onehippo.forge.selection.frontend.provider.IValueListProvider;
@@ -281,16 +284,24 @@ public class DynamicMultiSelectPlugin extends
RenderPlugin {
JcrNodeModel baseNodeModel = (JcrNodeModel)compareToRef.getModel();
if (baseNodeModel != null && baseNodeModel.getNode() != null) {
IFieldDescriptor field = helper.getField();
-JcrMultiPropertyValueModel baseModel = new
JcrMultiPropertyValueModel<>(new JcrItemModel(
-baseNodeModel.getItemModel().getPath() + '/' +
field.getPath()));
-
-List baseOptions = baseModel.getObject();
-List currentOptions = model.getObject();
-List changes =
LCS.getChangeSet(baseOptions.toArray(new String[baseOptions.size()]),
-currentOptions.toArray(new
String[currentOptions.size()]));
+try {
+if
(baseNodeModel.getNode().getSession().itemExists(baseNodeModel.getItemModel().getPath()
+ '/' + field.getPath())) {
+JcrMultiPropertyValueModel baseModel = new
JcrMultiPropertyValueModel<>(new JcrItemModel(
+baseNodeModel.getItemModel().getPath() + '/' +
field.getPath()));
+
+List baseOptions = baseModel.getObject();
+List currentOptions = model.getObject();
+List changes =
LCS.getChangeSet(baseOptions.toArray(new String[baseOptions.size()]),
+currentOptions.toArray(new
String[currentOptions.size()]));
+// show view list
+modeFragment.add(new CompareView("viewitems", changes,
valueList));
+} else {
+modeFragment.add(new ListView("viewitems",
model.getObject(), valueList));
+}
+} catch (RepositoryException e) {
+log.error("RepositoryException : ", e);
+}
-// show view list
-modeFragment.add(new CompareView("viewitems", changes,
valueList));
} else {
modeFragment.add(new ListView("viewitems", model.getObject(),
valueList));
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-selections/commit/435ce166782b88859c5b269cae33d3f78693f3e0
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new tag hippo-essentials-3.0.1-rc-1
Arent-Jan Banck pushed new tag hippo-essentials-3.0.1-rc-1 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][bugfix/HIPPLUG-1344] HIPPLUG-1344 Revert rename of style.css
Arthur Bogaart pushed to branch bugfix/HIPPLUG-1344 at cms-community /
hippo-plugin-taxonomy
Commits:
f6dc15e7 by Arthur Bogaart at 2016-08-19T15:18:39+02:00
HIPPLUG-1344 Revert rename of style.css
Stay backwards compatible, package name is clear enough.
- - - - -
3 changed files:
-
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyEditorPlugin.java
-
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyPickerPlugin.java
- addon/frontend/src/main/resources/org/onehippo/taxonomy/plugin/taxonomy.css ā
addon/frontend/src/main/resources/org/onehippo/taxonomy/plugin/style.css
Changes:
=
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyEditorPlugin.java
=
---
a/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyEditorPlugin.java
+++
b/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyEditorPlugin.java
@@ -104,7 +104,7 @@ public class TaxonomyEditorPlugin extends
RenderPlugin {
private static final Logger log =
LoggerFactory.getLogger(TaxonomyEditorPlugin.class);
-private static final CssResourceReference CSS = new
CssResourceReference(TaxonomyEditorPlugin.class, "taxonomy.css");
+private static final CssResourceReference CSS = new
CssResourceReference(TaxonomyEditorPlugin.class, "style.css");
private static final String MENU_ACTION_STYLE_CLASS = "menu-action";
private static final String DISABLED_ACTION_STYLE_CLASS =
"taxonomy-disabled-action";
private static final String DISABLED_MENU_ACTION_STYLE_CLASS =
MENU_ACTION_STYLE_CLASS + " " + DISABLED_ACTION_STYLE_CLASS;
=
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyPickerPlugin.java
=
---
a/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyPickerPlugin.java
+++
b/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyPickerPlugin.java
@@ -82,7 +82,7 @@ public class TaxonomyPickerPlugin extends RenderPlugin {
static final Logger log =
LoggerFactory.getLogger(TaxonomyPickerPlugin.class);
-private static final CssResourceReference CSS = new
CssResourceReference(TaxonomyPickerPlugin.class, "taxonomy.css");
+private static final CssResourceReference CSS = new
CssResourceReference(TaxonomyPickerPlugin.class, "style.css");
private static final String INVALID_TAXONOMY_KEY = "invalid.taxonomy.key";
private static final String INVALID_TAXONOMY_CATEGORY_KEY =
"invalid.taxonomy.category.key";
=
addon/frontend/src/main/resources/org/onehippo/taxonomy/plugin/taxonomy.css ā
addon/frontend/src/main/resources/org/onehippo/taxonomy/plugin/style.css
=
---
a/addon/frontend/src/main/resources/org/onehippo/taxonomy/plugin/taxonomy.css
+++ b/addon/frontend/src/main/resources/org/onehippo/taxonomy/plugin/style.css
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/f6dc15e7486611ce61b3ebb0ed0668421abb6e1b
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
