[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/spaplus] 2 commits: HSTTWO-4275: Suppressing AutoReloadResponseAppender in SpaSitePipeline

2018-03-15 Thread Woonsan Ko 
Woonsan Ko pushed to branch feature/spaplus at cms-community / 
hippo-site-toolkit


Commits:
01c12e1b by Woonsan Ko at 2018-03-15T11:58:53-04:00
HSTTWO-4275: Suppressing AutoReloadResponseAppender in SpaSitePipeline

- - - - -
e3593309 by Woonsan Ko at 2018-03-15T12:02:44-04:00
HSTTWO-4275: merging the conflicts

- - - - -


2 changed files:

- 
components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-invoker.xml
- 
components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-pipelines.xml


Changes:

=
components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-invoker.xml
=
--- 
a/components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-invoker.xml
+++ 
b/components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-invoker.xml
@@ -81,5 +81,16 @@
 
   
 
+  
+
+  
+
+  
+ 
+  
+
+  
+
 
 


=
components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-pipelines.xml
=
--- 
a/components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-pipelines.xml
+++ 
b/components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-pipelines.xml
@@ -153,6 +153,11 @@
 
   
 
+  
+
+
+  
+
   
 
   
@@ -252,7 +257,7 @@
 
 
 
-
+
   
 
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/compare/5d19d5bc22e5b785cf0a50e86ce62d1c7c7770a0...e3593309214fcee79a3385438f8435c427e1d762

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/compare/5d19d5bc22e5b785cf0a50e86ce62d1c7c7770a0...e3593309214fcee79a3385438f8435c427e1d762
You're receiving this email because of your account on code.onehippo.org.
___
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/spaplus] HSTTWO-4274 Add 'site' link for content items

2018-03-15 Thread Ard Schrijvers 
Ard Schrijvers pushed to branch feature/spaplus at cms-community / 
hippo-site-toolkit


Commits:
5d19d5bc by Ard Schrijvers at 2018-03-15T16:55:01+01:00
HSTTWO-4274 Add site link for content items

This is part 1 of HSTTWO-4274. Admittedly, I do a bit of dirty pipeline
name check, certainly because this is in the content-beans module.

However, for now, I do not see any easy alternative. The more formal
approach with getMount(String alias) will be very complex in usage when
dealing with multiple sites. Hence, I chose for this, arguably, hacky
short cut which in practice most likely will be much more effective than
the eloquent getMount(String alias) approach (since that usage is just
very complex when for example requiring mapped aliases).

Certainly if we will auto-append the PageModelPipeline mount based on some
property, this approach is way more stable

- - - - -


2 changed files:

- 
components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
- 
content-beans/src/main/java/org/hippoecm/hst/content/beans/support/jackson/HippoBeanLinksVirtualBeanPropertyWriter.java


Changes:

=
components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
=
--- 
a/components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
+++ 
b/components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
@@ -294,10 +294,13 @@ public class PageModelAggregationValve extends 
AggregationValve {
 final HstLink selfLink = linkCreator.create(siteMapItem, selfMount);
 pageModel.putLink(ContainerConstants.LINK_NAME_SELF, 
selfLink.toUrlForm(requestContext, true));
 
-final Mount siteMount = 
requestContext.getMount(ContainerConstants.MOUNT_ALIAS_SITE);
+final Mount siteMount = selfMount.getParent();
 if (siteMount != null) {
 final HstLink siteLink = linkCreator.create(siteMapItem, 
siteMount);
 pageModel.putLink(ContainerConstants.LINK_NAME_SITE, 
siteLink.toUrlForm(requestContext, true));
+} else {
+log.warn("Expected a 'PageModelPipeline' always to be nested below 
a parent site mount. This is not the " +
+"case for '{}'. Cannot add site links", selfMount);
 }
 }
 


=
content-beans/src/main/java/org/hippoecm/hst/content/beans/support/jackson/HippoBeanLinksVirtualBeanPropertyWriter.java
=
--- 
a/content-beans/src/main/java/org/hippoecm/hst/content/beans/support/jackson/HippoBeanLinksVirtualBeanPropertyWriter.java
+++ 
b/content-beans/src/main/java/org/hippoecm/hst/content/beans/support/jackson/HippoBeanLinksVirtualBeanPropertyWriter.java
@@ -21,10 +21,11 @@ import java.util.Map;
 import org.hippoecm.hst.configuration.hosting.Mount;
 import org.hippoecm.hst.container.RequestContextProvider;
 import org.hippoecm.hst.content.beans.standard.HippoBean;
-import org.hippoecm.hst.core.container.ContainerConstants;
 import org.hippoecm.hst.core.linking.HstLink;
 import org.hippoecm.hst.core.linking.HstLinkCreator;
 import org.hippoecm.hst.core.request.HstRequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JavaType;
@@ -35,9 +36,15 @@ import 
com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
 import com.fasterxml.jackson.databind.ser.VirtualBeanPropertyWriter;
 import com.fasterxml.jackson.databind.util.Annotations;
 
+import static 
org.hippoecm.hst.core.container.ContainerConstants.LINK_NAME_SELF;
+import static 
org.hippoecm.hst.core.container.ContainerConstants.LINK_NAME_SITE;
+
 public class HippoBeanLinksVirtualBeanPropertyWriter extends 
VirtualBeanPropertyWriter {
 
 private static final long serialVersionUID = 1L;
+public static final String PAGE_MODEL_PIPELINE_NAME = "PageModelPipeline";
+
+private static Logger log = 
LoggerFactory.getLogger(HippoBeanLinksVirtualBeanPropertyWriter.class);
 
 @SuppressWarnings("unused")
 public HippoBeanLinksVirtualBeanPropertyWriter() {
@@ -71,7 +78,23 @@ public class HippoBeanLinksVirtualBeanPropertyWriter extends 
VirtualBeanProperty
 final HstLink selfLink = linkCreator.create(hippoBean.getNode(), 
selfMount);
 
 if (selfLink!= null && !selfLink.isNotFound()) {
-linksMap.put(ContainerConstants.LINK_NAME_SELF, 
selfLink.toUrlForm(requestContext, true));
+linksMap.put(LINK_NAME_SELF, selfLink.toUrlForm(requestContext, 
false));
+
+// admittedly a bit of a dirty check to check on 
PageModelPipeline. Can this be improved?
+if (PAGE_MODEL_PIPELINE_NAME.equals(selfMount.getNamedPipeline())) 
{
+final Mount siteMount = selfMount.getParent();
+

[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][master] CHANNELMGR-1758 Register translations for fields in CC step1

2018-03-15 Thread Arthur Bogaart 
Arthur Bogaart pushed to branch master at cms-community / hippo-cms-translations


Commits:
ea789c22 by Arthur Bogaart at 2018-03-15T16:14:40+01:00
CHANNELMGR-1758 Register translations for fields in CC step1

- - - - -


2 changed files:

- channel-manager/resources/angular/hippo-cm/i18n/en.json
- channel-manager/resources/angular/hippo-cm/i18n/registry.json


Changes:

=
channel-manager/resources/angular/hippo-cm/i18n/en.json
=
--- a/channel-manager/resources/angular/hippo-cm/i18n/en.json
+++ b/channel-manager/resources/angular/hippo-cm/i18n/en.json
@@ -19,6 +19,7 @@
   "ERROR_TEMPLATE_QUERY_NOT_FOUND": "Template query '{{templateQuery}}' was 
not found",
   "EXPAND": "Expand",
   "SUBPAGE_PAGE_PROPERTIES_ALERT_CONTENT_REPOSITIONING": "Container items on 
this page will be repositioned when this page is saved with this template",
+  "PLACEHOLDER_DOCUMENT_TYPE": "Document Type",
   "SAVE_CHANGES_ON_CREATE_DOCUMENT": "'{{documentName}}' has unsaved changes. 
Do you want to save or discard these changes before creating a new document?",
   "ERROR_ALREADY_DELETED": "Failed to delete. The document was previously 
deleted",
   "PUBLISH": "Publish",
@@ -73,6 +74,7 @@
   "ERROR_MENU_SAVE_FAILED": "Failed to save menu",
   "EDIT_DOCUMENT": "Edit '{{displayName}}'",
   "SAVE_CHANGES_GENERIC": "'{{documentName}}' has unsaved changes. Do you want 
to save or discard these changes?",
+  "PLACEHOLDER_DOCUMENT_NAME": "Document Name",
   "FEEDBACK_PROJECT_INVALID_STATE": "Document has project {{projectName}} in 
invalid state {{projectState}}",
   "TOOLBAR_BUTTON_CHANGES": "Changes",
   "CREATE_NEW_DOCUMENT_TYPE": "Create new {{documentType}}",
@@ -98,6 +100,7 @@
   "ERROR_DELETE_COMPONENT": "Cannot delete '{{component}}'",
   "TOOLBAR_SWITCH_VIEWER_MODE": "Viewer mode",
   "PICKER_TYPE_DOCUMENTS": "Documents",
+  "PLACEHOLDER_DOCUMENT_LOCATION": "Document Location",
   "SUBPAGE_CHANNEL_SETTINGS_TITLE": "Settings of '{{channelName}}'",
   "EDIT_MENU": "Edit menu",
   "SAVE_CHANGES_ON_SWITCH_TO_CONTENT_EDITOR_MESSAGE": "'{{documentName}}' has 
unsaved changes. Do you want to save or discard these changes before switching 
to the content editor?",
@@ -167,6 +170,7 @@
   "ERROR_CHANNEL_SWITCH_FAILED": "Failed to switch to destination channel",
   "FIELD_REQUIRED": "This field is required",
   "ERROR_DELETE_COMPONENT_ITEM_ALREADY_LOCKED": "Cannot delete 
'{{component}}': the container is locked by '{{lockedBy}}'",
+  "PLACEHOLDER_DOCUMENT_URL": "URL",
   "SAVE_CHANGES_ON_CLOSE_CHANNEL": "'{{documentName}}' has unsaved changes. Do 
you want to save or discard these changes before closing the channel?",
   "NOTIFICATION_DOCUMENT_SELECTED_FOR_COMPONENT": "Document selected for 
'{{componentName}}'",
   "SWITCH_TO_CONTENT_EDITOR": "Switch to content editor",


=
channel-manager/resources/angular/hippo-cm/i18n/registry.json
=
--- a/channel-manager/resources/angular/hippo-cm/i18n/registry.json
+++ b/channel-manager/resources/angular/hippo-cm/i18n/registry.json
@@ -936,6 +936,46 @@
 "ERROR_DOCUMENT_SELECTED_FOR_COMPONENT_ALREADY_LOCKED" : {
   "status" : "CLEAN",
   "locales" : null
+},
+"PLACEHOLDER_DOCUMENT_TYPE" : {
+  "status" : "ADDED",
+  "locales" : {
+"de" : "UNRESOLVED",
+"fr" : "UNRESOLVED",
+"nl" : "UNRESOLVED",
+"zh" : "UNRESOLVED",
+"es" : "UNRESOLVED"
+  }
+},
+"PLACEHOLDER_DOCUMENT_NAME" : {
+  "status" : "ADDED",
+  "locales" : {
+"de" : "UNRESOLVED",
+"fr" : "UNRESOLVED",
+"nl" : "UNRESOLVED",
+"zh" : "UNRESOLVED",
+"es" : "UNRESOLVED"
+  }
+},
+"PLACEHOLDER_DOCUMENT_LOCATION" : {
+  "status" : "ADDED",
+  "locales" : {
+"de" : "UNRESOLVED",
+"fr" : "UNRESOLVED",
+"nl" : "UNRESOLVED",
+"zh" : "UNRESOLVED",
+"es" : "UNRESOLVED"
+  }
+},
+"PLACEHOLDER_DOCUMENT_URL" : {
+  "status" : "ADDED",
+  "locales" : {
+"de" : "UNRESOLVED",
+"fr" : "UNRESOLVED",
+"nl" : "UNRESOLVED",
+"zh" : "UNRESOLVED",
+"es" : "UNRESOLVED"
+  }
 }
   }
 }
\ No newline at end of file



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-translations/commit/ea789c226799553ac5ffc8a23cc269432fb6330b

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-translations/commit/ea789c226799553ac5ffc8a23cc269432fb6330b
You're receiving this email because of your account on code.onehippo.org.
___
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 bugfix/CHANNELMGR-1758

2018-03-15 Thread Arthur Bogaart 
Arthur Bogaart deleted branch bugfix/CHANNELMGR-1758 at cms-community / 
hippo-addon-channel-manager

---

You're receiving this email because of your account on code.onehippo.org.
___
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-1758 Add translation keys for document fields in CC step 1

2018-03-15 Thread Arthur Bogaart 
Arthur Bogaart pushed to branch master at cms-community / 
hippo-addon-channel-manager


Commits:
705daff1 by Bert Leunis at 2018-03-15T16:05:05+01:00
CHANNELMGR-1758 Add translation keys for document fields in CC step 1

They are all placeholder texts. All words with capitals (in English)
since they work like titles for the fields.

- - - - -


4 changed files:

- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.html
- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.html
- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step1/step1.html
- frontend-ng/src/i18n/en.json


Changes:

=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.html
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.html
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.html
@@ -20,17 +20,17 @@
 
   
 
-  /{{::folder.displayName }}
 
 search
   
   
   


=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.html
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.html
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.html
@@ -19,7 +19,7 @@
   
 
   
 


=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step1/step1.html
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step1/step1.html
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step1/step1.html
@@ -28,7 +28,7 @@
 


=
frontend-ng/src/i18n/en.json
=
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -155,6 +155,10 @@
   "PICKER_TITLE": "Select internal link",
   "PICKER_TYPE_DOCUMENTS": "Documents",
   "PICKER_TYPE_SITEMAP_ITEMS": "Pages (Sitemap Items)",
+  "PLACEHOLDER_DOCUMENT_LOCATION": "Document Location",
+  "PLACEHOLDER_DOCUMENT_NAME": "Document Name",
+  "PLACEHOLDER_DOCUMENT_TYPE": "Document Type",
+  "PLACEHOLDER_DOCUMENT_URL": "URL",
   "PUBLISH": "Publish",
   "PUBLISH_ALL": "Publish all",
   "REMOVE": "Remove",



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/705daff144224ab4bcfb6f28df35388a797173e8

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/705daff144224ab4bcfb6f28df35388a797173e8
You're receiving this email because of your account on code.onehippo.org.
___
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][bugfix/CHANNELMGR-1758] CHANNELMGR-1758 Remove spaces

2018-03-15 Thread Arthur Bogaart 
Arthur Bogaart pushed to branch bugfix/CHANNELMGR-1758 at cms-community / 
hippo-addon-channel-manager


Commits:
e9e577d0 by Arthur Bogaart at 2018-03-15T16:02:45+01:00
CHANNELMGR-1758 Remove spaces

- - - - -


2 changed files:

- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.html
- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.html


Changes:

=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.html
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.html
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.html
@@ -20,10 +20,10 @@
 
   
 
-  /{{::folder.displayName }}
 
 search


=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.html
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.html
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.html
@@ -39,7 +39,7 @@
  placeholder="{{ ::'PLACEHOLDER_DOCUMENT_URL' | translate }}"
  type="text"
  ng-model="$ctrl.urlField"
- ng-disabled="!$ctrl.isManualUrlMode" 
+ ng-disabled="!$ctrl.isManualUrlMode"
  autocomplete="off"
  required>
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/e9e577d027bf6f41613704aa8e4b1f3099523896

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/e9e577d027bf6f41613704aa8e4b1f3099523896
You're receiving this email because of your account on code.onehippo.org.
___
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/spaplus] HSTTWO-4273 decorate returns same object so for clarity make it void

2018-03-15 Thread Ard Schrijvers 
Ard Schrijvers pushed to branch feature/spaplus at cms-community / 
hippo-site-toolkit


Commits:
e516b1f8 by Ard Schrijvers at 2018-03-15T16:00:55+01:00
HSTTWO-4273 decorate returns same object so for clarity make it void

Minor change: I think this is more clear since the decorate returns
the very same object.

- - - - -


3 changed files:

- 
api/src/main/java/org/hippoecm/hst/core/pagemodel/container/MetadataDecorator.java
- 
components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/HstBeansObjectMapperDecorator.java
- 
components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java


Changes:

=
api/src/main/java/org/hippoecm/hst/core/pagemodel/container/MetadataDecorator.java
=
--- 
a/api/src/main/java/org/hippoecm/hst/core/pagemodel/container/MetadataDecorator.java
+++ 
b/api/src/main/java/org/hippoecm/hst/core/pagemodel/container/MetadataDecorator.java
@@ -32,7 +32,7 @@ public interface MetadataDecorator {
  * @param response HstResponse instance
  * @param metadataModel metadata model object to decorate
  */
-public void decorateComponentWindowMetadata(HstRequest request, 
HstResponse response,
+void decorateComponentWindowMetadata(HstRequest request, HstResponse 
response,
 MetadataContributable metadataModel);
 
 /**
@@ -41,7 +41,7 @@ public interface MetadataDecorator {
  * @param contentBean content bean object
  * @param metadataModel metadata model object to decorate
  */
-public void decorateContentMetadata(HstRequestContext requestContext, 
HippoBean contentBean,
+void decorateContentMetadata(HstRequestContext requestContext, HippoBean 
contentBean,
 MetadataContributable metadataModel);
 
 }


=
components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/HstBeansObjectMapperDecorator.java
=
--- 
a/components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/HstBeansObjectMapperDecorator.java
+++ 
b/components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/HstBeansObjectMapperDecorator.java
@@ -95,7 +95,7 @@ class HstBeansObjectMapperDecorator {
 private HstBeansObjectMapperDecorator() {
 }
 
-static ObjectMapper decorate(final ObjectMapper objectMapper, final 
Map extraMixins) {
+static void decorate(final ObjectMapper objectMapper, final Map extraMixins) {
 if (defaultMixins != null) {
 defaultMixins.forEach((clazz, mixin) -> {
 objectMapper.addMixIn(clazz, mixin);
@@ -107,7 +107,5 @@ class HstBeansObjectMapperDecorator {
 objectMapper.addMixIn(clazz, mixin);
 });
 }
-
-return objectMapper;
 }
 }


=
components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
=
--- 
a/components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
+++ 
b/components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
@@ -95,10 +95,8 @@ public class PageModelAggregationValve extends 
AggregationValve {
 private final List metadataDecorators = new 
ArrayList<>();
 
 public PageModelAggregationValve(final ObjectMapper objectMapperInput, 
final Map extraMixins) {
-objectMapper = HstBeansObjectMapperDecorator.decorate(
-objectMapperInput.registerModule(
-new SimpleModule().setSerializerModifier(new 
HippoBeanModelsSerializerModifier(metadataDecorators))),
-extraMixins);
+objectMapper = objectMapperInput.registerModule(new 
SimpleModule().setSerializerModifier(new 
HippoBeanModelsSerializerModifier(metadataDecorators)));
+HstBeansObjectMapperDecorator.decorate(objectMapper, extraMixins);
 }
 
 /**



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/e516b1f8ed2e4787e01b8dc75de50aee2cbe543f

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/e516b1f8ed2e4787e01b8dc75de50aee2cbe543f
You're receiving this email because of your account on code.onehippo.org.
___
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-1763

2018-03-15 Thread Arthur Bogaart 
Arthur Bogaart pushed new branch bugfix/CHANNELMGR-1763 at cms-community / 
hippo-addon-channel-manager

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1763
You're receiving this email because of your account on code.onehippo.org.
___
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/spaplus] HSTTWO-4225 remove support for action/resource and component rendering request

2018-03-15 Thread Ard Schrijvers 
Ard Schrijvers pushed to branch feature/spaplus at cms-community / 
hippo-site-toolkit


Commits:
e3f1b824 by Ard Schrijvers at 2018-03-15T15:30:28+01:00
HSTTWO-4225 remove support for action/resource and component rendering request

There is no use case AFAICS for an SpaSitePipeline to ever serve a
action, resource or component rendering request.

- - - - -


2 changed files:

- 
components/core/src/main/java/org/hippoecm/hst/core/container/SelectiveRenderingContextResolvingValve.java
- 
components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-pipelines.xml


Changes:

=
components/core/src/main/java/org/hippoecm/hst/core/container/SelectiveRenderingContextResolvingValve.java
=
--- 
a/components/core/src/main/java/org/hippoecm/hst/core/container/SelectiveRenderingContextResolvingValve.java
+++ 
b/components/core/src/main/java/org/hippoecm/hst/core/container/SelectiveRenderingContextResolvingValve.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2015 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2018 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.
@@ -40,14 +40,6 @@ public class SelectiveRenderingContextResolvingValve extends 
ContextResolvingVal
 HstComponentConfiguration rootComponentConfig) {
 HstComponentWindow rootComponentWindow = 
super.createRootComponentWindow(context, rootComponentConfig);
 
-final HstRequestContext requestContext = context.getRequestContext();
-final String componentRenderingWindowReferenceNamespace = 
requestContext.getBaseURL()
-.getComponentRenderingWindowReferenceNamespace();
-
-if (componentRenderingWindowReferenceNamespace != null) {
-return rootComponentWindow;
-}
-
 Map childMap = 
rootComponentWindow.getChildWindowMap();
 
 if (childMap != null) {


=
components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-pipelines.xml
=
--- 
a/components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-pipelines.xml
+++ 
b/components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-pipelines.xml
@@ -250,12 +250,8 @@
 
 
 
-
-
 
-
 
-
 
   
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/e3f1b824687c103245ad3f198114721bc8d49740

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/e3f1b824687c103245ad3f198114721bc8d49740
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor] 8d5f04: CMS-11128 Support node 8

2018-03-15 Thread GitHub 
  Branch: refs/heads/hippo/4.5.x
  Home:   https://github.com/onehippo/ckeditor
  Commit: 8d5f0464f68c444e34f1901d0e82fd07e5782556
  
https://github.com/onehippo/ckeditor/commit/8d5f0464f68c444e34f1901d0e82fd07e5782556
  Author: Arthur Bogaart 
  Date:   2018-03-15 (Thu, 15 Mar 2018)

  Changed paths:
M README.md
A package-lock.json
M package.json

  Log Message:
  ---
  CMS-11128 Support node 8


___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch bugfix/ESSENTIALS-1167

2018-03-15 Thread Jeroen Hoffman 
Jeroen Hoffman deleted branch bugfix/ESSENTIALS-1167 at cms-community / 
hippo-essentials

---

You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] 3 commits: ESSENTIALS-1167 added componentclassname for search

2018-03-15 Thread Jeroen Hoffman 
Jeroen Hoffman pushed to branch master at cms-community / hippo-essentials


Commits:
5910267b by Jasper Floor at 2018-02-15T16:27:46+01:00
ESSENTIALS-1167 added componentclassname for search

- - - - -
c197fc4e by Jeroen Hoffman at 2018-03-14T16:42:15+01:00
ESSENTIALS-1167 Merge branch master into bugfix/ESSENTIALS-1167

- - - - -
56946c28 by Jeroen Hoffman at 2018-03-15T11:27:30+01:00
ESSENTIALS-1167 Reintegrate branch bugfix/ESSENTIALS-1167 into master

- - - - -


1 changed file:

- plugins/search/src/main/resources/instructions/xml/hst/search-catalog.xml


Changes:

=
plugins/search/src/main/resources/instructions/xml/hst/search-catalog.xml
=
--- a/plugins/search/src/main/resources/instructions/xml/hst/search-catalog.xml
+++ b/plugins/search/src/main/resources/instructions/xml/hst/search-catalog.xml
@@ -19,6 +19,9 @@
   
 hst:containeritemcomponent
   
+  
+
org.onehippo.cms7.essentials.components.EssentialsSearchComponent
+  
   
 Search Box
   



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-essentials/compare/35da761463727b84edb0728317bc8ec5ba64614c...56946c28330d5abdf2d3a49e912fba857e6b915a

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-essentials/compare/35da761463727b84edb0728317bc8ec5ba64614c...56946c28330d5abdf2d3a49e912fba857e6b915a
You're receiving this email because of your account on code.onehippo.org.
___
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/msdts] REPO-1966 Baseline model should include nodes from known extensions during bootstrap

2018-03-15 Thread Sergey Shepelevich 
Sergey Shepelevich pushed to branch feature/msdts at cms-community / 
hippo-repository


Commits:
f0af405e by Sergey Shepelevich at 2018-03-15T09:35:07+01:00
REPO-1966 Baseline model should include nodes from known extensions during 
bootstrap

- - - - -


1 changed file:

- engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.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
@@ -85,6 +85,7 @@ import org.slf4j.LoggerFactory;
 import com.google.common.io.Files;
 
 import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toSet;
 import static org.hippoecm.repository.api.HippoNodeType.HIPPO_LOCK;
 import static org.onehippo.cm.engine.Constants.HCM_NAMESPACE;
 import static org.onehippo.cm.engine.Constants.HCM_PREFIX;
@@ -204,8 +205,8 @@ public class ConfigurationServiceImpl implements 
InternalConfigurationService {
 ensureInitialized();
 
 // attempt to load a baseline, which may be empty -- we will need 
this if (mustConfigure == false)
-// TODO: call with appropriate extensions
-ConfigurationModelImpl baselineModel = loadBaselineModel();
+final Set knownExtensions = 
ExtensionRegistry.getContexts().values().stream().map(ExtensionEvent::getExtensionName).collect(toSet());
+ConfigurationModelImpl baselineModel = 
loadBaselineModel(knownExtensions);
 
 // check the appropriate params to determine our state and 
bootstrap mode
 // empty baseline means we've never applied the v12+ bootstrap 
model before, since we should have at
@@ -236,8 +237,6 @@ public class ConfigurationServiceImpl implements 
InternalConfigurationService {
 final List modulesFromSourceFiles = 
readModulesFromSourceFiles(bootstrapModel);
 // add all of the filesystem modules to a new 
model as "replacements" that override later additions
 
-final List knownExtensions = 
ExtensionRegistry.getContexts().values().stream().map(ExtensionEvent::getExtensionName).collect(toList());
-
 final List eligibleModules = 
modulesFromSourceFiles.stream()
 .filter(m -> m.getExtension() == null || 
knownExtensions.contains(m.getExtension())).collect(toList());
 bootstrapModel = 
mergeWithSourceModules(eligibleModules, bootstrapModel);



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/f0af405e264d01daadd00e676eb8bc0f6d9a94ce
You're receiving this email because of your account on code.onehippo.org.
___
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-1758

2018-03-15 Thread Bert Leunis 
Bert Leunis pushed new branch bugfix/CHANNELMGR-1758 at cms-community / 
hippo-addon-channel-manager

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1758
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn