[HippoCMS-scm] [Git][cms-community/hippo-testsuite] Pushed new branch feature/CMS-10753-2

[Woonsan Ko]

Woonsan Ko pushed new branch feature/CMS-10753-2 at cms-community / 
hippo-testsuite
___
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] Pushed new branch feature/CMS-10753

[Woonsan Ko]

Woonsan Ko pushed new branch feature/CMS-10753 at cms-community / 
hippo-cms-release
___
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-10753-2

[Woonsan Ko]

Woonsan Ko pushed new branch feature/CMS-10753-2 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][feature/hcm] REPO-1698 (aka HCM-113) Refactoring to prepare for new implementation of ModuleDescriptorParser

[Peter Centgraf]

Peter Centgraf pushed to branch feature/hcm at cms-community / hippo-repository


Commits:
86fd88ac by Peter Centgraf at 2017-06-06T17:20:53+02:00
REPO-1698 (aka HCM-113) Refactoring to prepare for new implementation of 
ModuleDescriptorParser

- - - - -


2 changed files:

- engine/src/main/java/org/onehippo/cm/engine/ConfigurationBaselineService.java
- 
engine/src/test/java/org/onehippo/cm/engine/autoexport/DefinitionMergeTest.java


Changes:

=
engine/src/main/java/org/onehippo/cm/engine/ConfigurationBaselineService.java
=
--- 
a/engine/src/main/java/org/onehippo/cm/engine/ConfigurationBaselineService.java
+++ 
b/engine/src/main/java/org/onehippo/cm/engine/ConfigurationBaselineService.java
@@ -23,6 +23,7 @@ import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -54,14 +55,11 @@ import org.onehippo.cm.model.Project;
 import org.onehippo.cm.model.Source;
 import org.onehippo.cm.model.Value;
 import org.onehippo.cm.model.impl.ConfigurationModelImpl;
-import org.onehippo.cm.model.impl.ContentDefinitionImpl;
-import org.onehippo.cm.model.impl.ContentSourceImpl;
-import org.onehippo.cm.model.impl.DefinitionNodeImpl;
 import org.onehippo.cm.model.impl.GroupImpl;
 import org.onehippo.cm.model.impl.ModuleImpl;
 import org.onehippo.cm.model.impl.ProjectImpl;
 import org.onehippo.cm.model.parser.ConfigSourceParser;
-import org.onehippo.cm.model.parser.ModuleDescriptorParser;
+import org.onehippo.cm.model.parser.AggregatedModulesDescriptorParser;
 import org.onehippo.cm.model.parser.ParserException;
 import org.onehippo.repository.util.JcrConstants;
 import org.slf4j.Logger;
@@ -513,7 +511,7 @@ public class ConfigurationBaselineService {
 throws RepositoryException, ParserException {
 // for each module node under this baseline
 for (Node moduleNode : findModuleNodes(baselineNode)) {
-Map moduleGroups;
+Collection moduleGroups;
 ModuleImpl module;
 
 Node descriptorNode = moduleNode.getNode(HCM_MODULE_DESCRIPTOR);
@@ -523,12 +521,13 @@ public class ConfigurationBaselineService {
 final String descriptor = 
descriptorNode.getProperty(HCM_YAML).getString();
 if (StringUtils.isNotEmpty(descriptor)) {
 // parse descriptor with ModuleDescriptorParser
+// todo switch to single-module alternate parser
 InputStream is = IOUtils.toInputStream(descriptor, 
StandardCharsets.UTF_8);
-moduleGroups = new 
ModuleDescriptorParser(DEFAULT_EXPLICIT_SEQUENCING)
+moduleGroups = new 
AggregatedModulesDescriptorParser(DEFAULT_EXPLICIT_SEQUENCING)
 .parse(is, moduleNode.getPath());
 
 // This should always produce exactly one module!
-module = moduleGroups.values().stream()
+module = moduleGroups.stream()
 .flatMap(g -> g.getProjects().stream())
 .flatMap(p -> p.getModules().stream())
 .findFirst().get();
@@ -555,7 +554,7 @@ public class ConfigurationBaselineService {
 }
 
 // accumulate all groups
-groups.addAll(moduleGroups.values());
+groups.addAll(moduleGroups);
 }
 
 log.debug("After parsing descriptors, we have {} groups and {} 
modules", groups.size(),


=
engine/src/test/java/org/onehippo/cm/engine/autoexport/DefinitionMergeTest.java
=
--- 
a/engine/src/test/java/org/onehippo/cm/engine/autoexport/DefinitionMergeTest.java
+++ 
b/engine/src/test/java/org/onehippo/cm/engine/autoexport/DefinitionMergeTest.java
@@ -32,7 +32,6 @@ import org.onehippo.cm.model.Constants;
 import org.onehippo.cm.model.FileConfigurationWriter;
 import org.onehippo.cm.model.ModuleContext;
 import org.onehippo.cm.model.PathConfigurationReader;
-import org.onehippo.cm.model.SerializerTest;
 import org.onehippo.cm.model.impl.ConfigurationModelImpl;
 import org.onehippo.cm.model.impl.ModuleImpl;
 import org.slf4j.Logger;
@@ -180,7 +179,7 @@ public class DefinitionMergeTest {
 final PathConfigurationReader.ReadResult result =
 readFromResource(modulePath + "/" + 
Constants.HCM_MODULE_YAML);
 
-return result.getGroups().values().stream()
+return result.getGroups().stream()
 .flatMap(group -> group.getProjects().stream())
 .flatMap(project -> project.getModules().stream())
 .findFirst().get();



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/86fd88ac1fa463b6c0740dafd06b6727273f0f39

[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/hcm] REPO-1685 push some more work-in-progress changes and/or todo comments

[Ate Douma]

Ate Douma pushed to branch feature/hcm at cms-community / hippo-repository


Commits:
07bf27a0 by Ate Douma at 2017-06-06T16:53:51+02:00
REPO-1685 push some more work-in-progress changes and/or todo comments

- - - - -


2 changed files:

- engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java
- 
engine/src/main/java/org/onehippo/cm/engine/autoexport/EventJournalProcessor.java


Changes:

=
engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java
=
--- a/engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java
+++ b/engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java
@@ -116,6 +116,9 @@ public class ConfigurationServiceImpl implements 
InternalConfigurationService {
 success = storeBaselineModel(bootstrapModel);
 }
 if (success) {
+// TODO: this doesn't yet account for possible update 
of the baseline through applyContent (like Module sequence)
+runtimeConfigurationModel = loadBaselineModel();
+
 // TODO: probably also should pass in baselineModel 
(or runtimeConfigurationModel, if updated, see above)
 //   applied changes then should also be applied 
to/updated in runtimeConfigurationModel
 //   furthermore, ContentService should use 
BaselineService to do the updates, not directly to JCR


=
engine/src/main/java/org/onehippo/cm/engine/autoexport/EventJournalProcessor.java
=
--- 
a/engine/src/main/java/org/onehippo/cm/engine/autoexport/EventJournalProcessor.java
+++ 
b/engine/src/main/java/org/onehippo/cm/engine/autoexport/EventJournalProcessor.java
@@ -77,6 +77,9 @@ public class EventJournalProcessor {
 
 private static final int MAX_REPEAT_PROCESS_EVENTS = 3;
 
+/**
+ * Track changed jcr paths of *parent* nodes of jcr events
+ */
 protected static class Changes {
 private Set changedNsPrefixes = new HashSet<>();
 private TreeSet addedConfig = new TreeSet<>();
@@ -178,6 +181,7 @@ public class EventJournalProcessor {
 
 public void start() {
 exclusionContext = configuration.getExclusionContext();
+// TODO: should we 'refresh' the currentModel here as well?
 synchronized (executor) {
 if (future == null || future.isCancelled() || future.isDone()) {
 future = executor.scheduleWithFixedDelay(task, 0, 
minChangeLogAge, TimeUnit.MILLISECONDS);
@@ -462,6 +466,7 @@ public class EventJournalProcessor {
 }
 
 private void exportChangesModule(ModuleImpl changesModule) throws 
RepositoryException {
+// TODO: move this to internal implementation/handling within 
DefinitionMergeService
 Set exportModules = new HashSet<>();
 for (GroupImpl g : currentModel.getSortedGroups()) {
 for (ProjectImpl p : g.getProjects()) {
@@ -481,6 +486,7 @@ public class EventJournalProcessor {
 // TODO  2) configuration.setLastRevision(lastRevision)
 // TODO  3) save result to baseline (which should do Session.save() 
thereby also saving the lastRevision update
 // TODO  4) update or reload ConfigurationService.currentRuntimeModel
+// TODO  NOTE: the above might need to be owned/implemented by 
ConfigurationServiceImpl
 // TODO  5) update/set EventJournalProcessor.currentModel
 }
 }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/07bf27a08cb7543be24f31d3d4ee3967b1d2c14c
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch bugfix/REPO-1695

[Jeroen Hoffman]

Jeroen Hoffman pushed new branch bugfix/REPO-1695 at cms-community / 
hippo-repository
___
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/CHANNELMGR-1292

[Ariel Weinberger]

Ariel Weinberger pushed new branch feature/CHANNELMGR-1292 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][master] 3 commits: ARCHE-532 Added hippo-cms-theme.min.css to the whitelisted resources.

[Mathijs den Burger]

Mathijs den Burger pushed to branch master at cms-community / 
hippo-project-archetype


Commits:
ca3e0c9b by Michael Metternich at 2017-06-02T10:58:40+02:00
ARCHE-532 Added hippo-cms-theme.min.css to the whitelisted resources.

Resource servlets are now secured by default meaning the resources cannot
be served when the request was done when the user was not logged in.
But hippo-cms-theme.min.css is used on the login page, so this should
always be available.

- - - - -
1712e6dc by Michael Metternich at 2017-06-02T13:53:57+02:00
ARCHE-532 Removed whitelisted resources and made servlet unsecured.

- - - - -
d50c333b by Mathijs den Burger at 2017-06-06T12:34:36+02:00
ARCHE-532 Reintegrate feature/ARCHE-532

- - - - -


1 changed file:

- src/main/resources/archetype-resources/cms/src/main/webapp/WEB-INF/web.xml


Changes:

=
src/main/resources/archetype-resources/cms/src/main/webapp/WEB-INF/web.xml
=
--- a/src/main/resources/archetype-resources/cms/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/resources/archetype-resources/cms/src/main/webapp/WEB-INF/web.xml
@@ -148,6 +148,10 @@
 ^/.*\..*
   
 
+
+  requireAuthentication
+  false
+
   
 
   



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-project-archetype/compare/3aa834db1bc841b9c9a80257ca0e2121a761f3cd...d50c333bf89500f28fd5a36ba47a7bcb6a16
___
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] Deleted branch feature/ARCHE-532

[Mathijs den Burger]

Mathijs den Burger deleted branch feature/ARCHE-532 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-cms-utilities] Deleted branch feature/CMS-10733

[Mathijs den Burger]

Mathijs den Burger deleted branch feature/CMS-10733 at cms-community / 
hippo-cms-utilities
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/hcm] REPO-1694 Remove too aggressive override log message

[Tobias Jeger]

Tobias Jeger pushed to branch feature/hcm at cms-community / hippo-repository


Commits:
b17083ec by Tobias Jeger at 2017-06-06T12:05:38+02:00
REPO-1694 Remove too aggressive override log message

- - - - -


2 changed files:

- engine/src/main/java/org/onehippo/cm/engine/ConfigurationConfigService.java
- 
engine/src/test/java/org/onehippo/cm/engine/ConfigurationConfigServiceTest.java


Changes:

=
engine/src/main/java/org/onehippo/cm/engine/ConfigurationConfigService.java
=
--- 
a/engine/src/main/java/org/onehippo/cm/engine/ConfigurationConfigService.java
+++ 
b/engine/src/main/java/org/onehippo/cm/engine/ConfigurationConfigService.java
@@ -431,15 +431,6 @@ public class ConfigurationConfigService {
 childNode = addNode(targetNode, childName, childPrimaryType, 
updateChild);
 } else {
 if (baselineChild == null) {
-// node should not yet exist, but actually does; one edge 
case in which is ok and no message needs
-// to be logged is if the node is autoCreated and its 
parent was also just created
-if (!(existingChildNode.getDefinition().isAutoCreated() && 
existingChildNode.getParent().isNew())) {
-final String msg = String.format("[OVERRIDE] Node '%s' 
has been added, " +
-"but will be re-created due to the 
incoming definition %s.",
-updateChild.getPath(), 
updateChild.getOrigin());
-logger.info(msg);
-}
-
 final String childPrimaryType = 
existingChildNode.getPrimaryNodeType().getName();
 baselineChild = newChildOfType(childPrimaryType);
 }
@@ -620,10 +611,9 @@ public class ConfigurationConfigService {
 logger.info(msg);
 }
 } else {
-// property should not yet exist, but actually does; one edge 
case in which is ok and no message needs
-// to be logged is if the property is autoCreated and its 
parent was also just created; apparently, the
-// configuration contains a different value than the default 
value, as propertyIsIdentical returned
-// false, so we need to continue resetting the property
+// property should not yet exist, but does, with a different 
value.
+// This should not trigger an [OVERRIDE] message if the 
property is autoCreated and its parent
+// has just been created.
 if (!(jcrProperty.getDefinition().isAutoCreated() && 
jcrNode.isNew())) {
 final String msg = String.format("[OVERRIDE] Property '%s' 
has been created in the repository, " +
 "and will be overridden due to definition 
%s.",


=
engine/src/test/java/org/onehippo/cm/engine/ConfigurationConfigServiceTest.java
=
--- 
a/engine/src/test/java/org/onehippo/cm/engine/ConfigurationConfigServiceTest.java
+++ 
b/engine/src/test/java/org/onehippo/cm/engine/ConfigurationConfigServiceTest.java
@@ -1377,22 +1377,11 @@ public class ConfigurationConfigServiceTest extends 
BaseConfigurationConfigServi
 + "  /child:\n"
 + "jcr:primaryType: nt:unstructured";
 
-try (Log4jInterceptor interceptor = 
Log4jInterceptor.onInfo().trap(ConfigurationConfigService.class).build()) {
-applyDefinitions(definition, new ExpectedEvents());
-assertTrue(interceptor.messages().anyMatch(m -> m.equals(
-"[OVERRIDE] Node '/test/child' has been added, but will be 
re-created " +
-"due to the incoming definition 
[test-group/test-project/test-module-0 [string]].")));
-}
-
+applyDefinitions(definition, new ExpectedEvents());
 expectNode("/test", "[child]", "[jcr:primaryType]");
 
 // likewise for forceApply
-try (Log4jInterceptor interceptor = 
Log4jInterceptor.onInfo().trap(ConfigurationConfigService.class).build()) {
-applyDefinitions(definition, true, new ExpectedEvents());
-assertTrue(interceptor.messages().anyMatch(m -> m.equals(
-"[OVERRIDE] Node '/test/child' has been added, but will be 
re-created " +
-"due to the incoming definition 
[test-group/test-project/test-module-0 [string]].")));
-}
+applyDefinitions(definition, true, new ExpectedEvents());
 expectNode("/test", "[child]", "[jcr:primaryType]");
 }
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/b17083ec757e0f22ed9378be98ebd60850d68e42
___
Hippocms-svn mailing list

[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/hcm] REPO-1687 Refactor DefinitionMergeTest$MergeTest to ...$MergeFixture and make it…

[Peter Centgraf]

Peter Centgraf pushed to branch feature/hcm at cms-community / hippo-repository


Commits:
be464a85 by Peter Centgraf at 2017-06-06T11:49:21+02:00
REPO-1687 Refactor DefinitionMergeTest$MergeTest to ...$MergeFixture and make 
it clear it is not a runnable test itself

- - - - -


1 changed file:

- 
engine/src/test/java/org/onehippo/cm/engine/autoexport/DefinitionMergeTest.java


Changes:

=
engine/src/test/java/org/onehippo/cm/engine/autoexport/DefinitionMergeTest.java
=
--- 
a/engine/src/test/java/org/onehippo/cm/engine/autoexport/DefinitionMergeTest.java
+++ 
b/engine/src/test/java/org/onehippo/cm/engine/autoexport/DefinitionMergeTest.java
@@ -27,6 +27,7 @@ import java.util.Set;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.onehippo.cm.model.AbstractBaseTest;
 import org.onehippo.cm.model.Constants;
 import org.onehippo.cm.model.FileConfigurationWriter;
 import org.onehippo.cm.model.ModuleContext;
@@ -49,52 +50,52 @@ public class DefinitionMergeTest {
 
 @Test
 public void template_works() throws Exception {
-new MergeTest("template").test();
+new MergeFixture("template").test();
 }
 
 @Test
 public void create_and_update_namespaces() throws Exception {
-new MergeTest("namespace").test();
+new MergeFixture("namespace").test();
 }
 
 @Test
 public void new_node() throws Exception {
-new MergeTest("new-node").test();
+new MergeFixture("new-node").test();
 }
 
 @Test
 public void delete_node() throws Exception {
-new MergeTest("delete-node").test();
+new MergeFixture("delete-node").test();
 }
 
 @Test
 public void add_property() throws Exception {
-new MergeTest("add-property").test();
+new MergeFixture("add-property").test();
 }
 
 @Test
 public void append_property() throws Exception {
-new MergeTest("append-property").test();
+new MergeFixture("append-property").test();
 }
 
 @Test
 public void delete_property() throws Exception {
-new MergeTest("delete-property").test();
+new MergeFixture("delete-property").test();
 }
 
 @Test
 public void override_property() throws Exception {
-new MergeTest("override-property").test();
+new MergeFixture("override-property").test();
 }
 
 
-public class MergeTest extends SerializerTest {
+public class MergeFixture extends AbstractBaseTest {
 String testName;
 String[] base = {"topmost", "upstream"};
 String[] toExport = {"exportFirst", "exportSecond"};
 Configuration autoExportConfig;
 
-public MergeTest(final String testName) {
+public MergeFixture(final String testName) {
 this.testName = testName;
 
 Map modules = new HashMap<>();
@@ -103,17 +104,17 @@ public class DefinitionMergeTest {
 autoExportConfig = AutoExportConfigFactory.make(true, modules);
 }
 
-public MergeTest base(final String... base) {
+public MergeFixture base(final String... base) {
 this.base = base;
 return this;
 }
 
-public MergeTest toExport(final String... toExport) {
+public MergeFixture toExport(final String... toExport) {
 this.toExport = toExport;
 return this;
 }
 
-public MergeTest config(final Configuration config) {
+public MergeFixture config(final Configuration config) {
 this.autoExportConfig = config;
 return this;
 }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/be464a85bf9e9631a21901593ddfb8d9d65471b5
___
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][master] CHANNELMGR-1309 Fix CKEditor source dialog button margin, remove unused icons from toolbar

[Ariel Weinberger]

Ariel Weinberger pushed to branch master at cms-community / 
hippo-addon-channel-manager


Commits:
3145941f by Ariel Weinberger at 2017-06-06T11:47:47+02:00
CHANNELMGR-1309 Fix CKEditor source dialog button margin, remove unused icons 
from toolbar

- - - - -


1 changed file:

- 
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss


Changes:

=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss
=
--- 
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss
+++ 
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss
@@ -46,6 +46,17 @@
 
 .cke_top {
   border-bottom: 0 !important;
+
+  /* Remove codemirror buttons in CKEditor toolbar */
+  .cke_button {
+&.cke_button__searchcode,
+&.cke_button__autoformat,
+&.cke_button__commentselectedrange,
+&.cke_button__uncommentselectedrange,
+&.cke_button__autocomplete {
+   display: none;
+}
+  }
 }
 
 .cke_bottom {
@@ -67,4 +78,10 @@
   font-size: 12px;
 }
   }
+
+  .cke_dialog_ui_button {
+&.UncommentSelectedRange {
+  margin-top: 0 !important;
+}
+  }
 }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/3145941fa8dfa8dbd1751c21a46b5632edc5bf92
___
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/CHANNELMGR-1309

[Ariel Weinberger]

Ariel Weinberger pushed new branch feature/CHANNELMGR-1309 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] [onehippo/ckeditor] 742532: CHANNELMGR-1309 Include icons of codemirror plugin...

[GitHub]

  Branch: refs/heads/hippo/4.7.x
  Home:   https://github.com/onehippo/ckeditor
  Commit: 742532f25c8264674dfce816467229828f731ea2
  
https://github.com/onehippo/ckeditor/commit/742532f25c8264674dfce816467229828f731ea2
  Author: Mathijs den Burger 
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
M dev/builder/build.sh

  Log Message:
  ---
  CHANNELMGR-1309 Include icons of codemirror plugin in distribution

The codemirror plugin overrides the sourcedialog completely. It
adds four buttons to the top. Yet those button use individual icon
files (as a CSS background image) and not icons in the sprite
generated by CKBuilder. As a result the buttons don't have icons
when the 'optimized' Hippo CKEditor distribution is used.

This seems a bug in the codemirror plugin. As a quick fix we
include the icons in the optimized build so the buttons show icons
again.


___
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/wpm] HSTTWO-4009 Add missing license header

[Arent-Jan Banck]

Arent-Jan Banck pushed to branch feature/wpm at cms-community / 
hippo-site-toolkit


Commits:
c3441952 by Arent-Jan Banck at 2017-06-06T10:38:00+02:00
HSTTWO-4009 Add missing license header

- - - - -


1 changed file:

- 
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/api/annotation/IgnoreLock.java


Changes:

=
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/api/annotation/IgnoreLock.java
=
--- 
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/api/annotation/IgnoreLock.java
+++ 
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/api/annotation/IgnoreLock.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.hippoecm.hst.pagecomposer.jaxrs.api.annotation;
 
 import java.lang.annotation.Documented;



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/c3441952597124c01f8cf5c1131eb909d419ed2f
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-services-htmlprocessor] Pushed new branch feature/HHP-4

[Arthur Bogaart]

Arthur Bogaart pushed new branch feature/HHP-4 at cms-community / 
hippo-services-htmlprocessor
___
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 bugfix/CHANNELMGR-1308

[Arthur Bogaart]

Arthur Bogaart pushed new branch bugfix/CHANNELMGR-1308 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-repository][feature/hcm] REPO-1693 Fix jcr based Value resource access and file mapping

[Sergey Shepelevich]

Sergey Shepelevich pushed to branch feature/hcm at cms-community / 
hippo-repository


Commits:
e44e8b4c by Sergey Shepelevich at 2017-06-06T09:35:38+02:00
REPO-1693 Fix jcr based Value resource access and file mapping

Fixed string format

- - - - -


1 changed file:

- engine/src/main/java/org/onehippo/cm/engine/JcrResourceInputProvider.java


Changes:

=
engine/src/main/java/org/onehippo/cm/engine/JcrResourceInputProvider.java
=
--- a/engine/src/main/java/org/onehippo/cm/engine/JcrResourceInputProvider.java
+++ b/engine/src/main/java/org/onehippo/cm/engine/JcrResourceInputProvider.java
@@ -73,7 +73,7 @@ public class JcrResourceInputProvider implements 
ResourceInputProvider {
 if (valueIndex == 0) {
 return property.getValue().getBinary().getStream();
 } else {
-throw new IOException(String.format("Invalid JCR property 
{} value index {}: property is single value",
+throw new IOException(String.format("Invalid JCR property 
%s value index %s: property is single value",
 propertyPath, valueIndex));
 }
 } else {
@@ -81,7 +81,7 @@ public class JcrResourceInputProvider implements 
ResourceInputProvider {
 if (valueIndex >= 0 && valueIndex < values.length) {
 return values[valueIndex].getBinary().getStream();
 } else {
-throw new IOException(String.format("Invalid JCR property 
{} value index {}.",
+throw new IOException(String.format("Invalid JCR property 
%s value index %s.",
 propertyPath, valueIndex));
 }
 }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/e44e8b4c5358698baa062185b6409baad27d5787
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn