[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][feature/HIPPLUG-1465] HIPPLUG-1465: use the same version for plugin dependencies

[Woonsan Ko]

Woonsan Ko pushed to branch feature/HIPPLUG-1465 at cms-community / 
hippo-plugin-taxonomy


Commits:
8703e348 by Woonsan Ko at 2017-06-08T21:39:57-04:00
HIPPLUG-1465: use the same version for plugin dependencies

- - - - -


2 changed files:

- demo/cms/pom.xml
- demo/site/pom.xml


Changes:

=
demo/cms/pom.xml
=
--- a/demo/cms/pom.xml
+++ b/demo/cms/pom.xml
@@ -77,16 +77,19 @@
 
   org.onehippo.cms7
   hippo-plugin-taxonomy-api
+  ${project.version}
 
 
 
   org.onehippo.cms7
   hippo-plugin-taxonomy-addon-frontend
+  ${project.version}
 
 
 
   org.onehippo.cms7
   hippo-plugin-taxonomy-addon-repository
+  ${project.version}
 
 
 


=
demo/site/pom.xml
=
--- a/demo/site/pom.xml
+++ b/demo/site/pom.xml
@@ -91,6 +91,7 @@
 
   org.onehippo.cms7
   hippo-plugin-taxonomy-api
+  ${project.version}
 
 
 
@@ -101,6 +102,7 @@
 
   org.onehippo.cms7
   hippo-plugin-taxonomy-hstclient
+  ${project.version}
 
 
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/8703e3485b971fab74bc426076e5d83118450eb9
___
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] Pushed new branch feature/HIPPLUG-1465

[Woonsan Ko]

Woonsan Ko pushed new branch feature/HIPPLUG-1465 at cms-community / 
hippo-plugin-taxonomy
___
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][feature/HIPPLUG-1464] HIPPLUG-1464: adding up/down link actions

[Woonsan Ko]

Woonsan Ko pushed to branch feature/HIPPLUG-1464 at cms-community / 
hippo-plugin-taxonomy


Commits:
ca91063c by Woonsan Ko at 2017-06-08T21:22:12-04:00
HIPPLUG-1464: adding up/down link actions

- - - - -


2 changed files:

- 
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyPickerPlugin.java
- 
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/Classification.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
@@ -450,6 +450,9 @@ public class TaxonomyPickerPlugin extends 
RenderPlugin {
 
 private void addControlsToListItem(final ListItem item) {
 final boolean isEditMode = (mode == Mode.EDIT);
+
+final Classification classification = 
dao.getClassification(TaxonomyPickerPlugin.this.getModelObject());
+final int itemCount = classification.getKeyCount();
 final int itemIndex = item.getIndex();
 
 final WebMarkupContainer controls = new WebMarkupContainer("controls");
@@ -458,7 +461,14 @@ public class TaxonomyPickerPlugin extends 
RenderPlugin {
 final MarkupContainer upLink = new AjaxLink("up") {
 @Override
 public void onClick(AjaxRequestTarget target) {
-// TODO
+final String curKey = (String) item.getModelObject();
+if (classification.containsKey(curKey)) {
+final int curIndex = classification.indexOfKey(curKey);
+classification.removeKey(curKey);
+classification.addKey(curIndex - 1, curKey);
+dao.save(classification);
+target.add(TaxonomyPickerPlugin.this);
+}
 }
 };
 upLink.setEnabled(isEditMode && itemIndex > 0);
@@ -470,10 +480,17 @@ public class TaxonomyPickerPlugin extends 
RenderPlugin {
 final MarkupContainer downLink = new AjaxLink("down") {
 @Override
 public void onClick(AjaxRequestTarget target) {
-// TODO
+final String curKey = (String) item.getModelObject();
+if (classification.containsKey(curKey)) {
+final int curIndex = classification.indexOfKey(curKey);
+classification.removeKey(curKey);
+classification.addKey(curIndex + 1, curKey);
+dao.save(classification);
+target.add(TaxonomyPickerPlugin.this);
+}
 }
 };
-downLink.setEnabled(isEditMode);
+downLink.setEnabled(isEditMode && itemIndex < itemCount - 1);
 downLink.setVisible(isEditMode);
 final HippoIcon downIcon = HippoIcon.fromSprite("down-icon", 
Icon.ARROW_DOWN);
 downLink.add(downIcon);
@@ -482,7 +499,6 @@ public class TaxonomyPickerPlugin extends 
RenderPlugin {
 final MarkupContainer removeLink = new AjaxLink("remove") {
 @Override
 public void onClick(AjaxRequestTarget target) {
-final Classification classification = 
dao.getClassification(TaxonomyPickerPlugin.this.getModelObject());
 final String curKey = (String) item.getModelObject();
 if (classification.containsKey(curKey)) {
 classification.removeKey(curKey);


=
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/Classification.java
=
--- 
a/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/Classification.java
+++ 
b/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/Classification.java
@@ -40,11 +40,10 @@ public class Classification implements IDetachable {
 this.canonical = canonical;
 }
 
-
 public IDetachable getId() {
 return id;
 }
-
+
 public List getKeys() {
 return values;
 }
@@ -53,17 +52,44 @@ public class Classification implements IDetachable {
 return getKeys().contains(key);
 }
 
+/**
+ * Returns the size of keys.
+ * @return the size of keys
+ */
+public int getKeyCount() {
+return values.size();
+}
+
+/**
+ * Returns the index of the {@code key}, or -1 if this {@code key} does 
not exist.
+ * @param key category key
+ * @return the index of the {@code key}, or -1 if this {@code key} does 
not exist
+ */
+public int indexOfKey(String key) {
+return values.indexOf(key);
+}
+
 public void addKey(String key) {
 if (!values.contains(key)) {
 values.add(key);
 }
 }
 
+/**
+ * Inserts the specified {@code key} at the specified position.
+

[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy] Pushed new branch feature/HIPPLUG-1464

[Woonsan Ko]

Woonsan Ko pushed new branch feature/HIPPLUG-1464 at cms-community / 
hippo-plugin-taxonomy
___
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-1320 Add hippo-services dependency to frontend

[Arent-Jan Banck]

Arent-Jan Banck pushed to branch master at cms-community / 
hippo-addon-channel-manager


Commits:
12d3af62 by Arent-Jan Banck at 2017-06-08T22:44:08+02:00
CHANNELMGR-1320 Add hippo-services dependency to frontend

- - - - -


1 changed file:

- frontend/pom.xml


Changes:

=
frontend/pom.xml
=
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -60,6 +60,11 @@
 
 
   org.onehippo.cms7
+  hippo-services
+
+
+
+  org.onehippo.cms7
   hippo-cms7-commons
   provided
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/12d3af62f58a147f7491b6e7709b38d3c907c636
___
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 feature/ESSENTIALS-1045-A

[Marijan Milicevic]

Marijan Milicevic deleted branch feature/ESSENTIALS-1045-A 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-addon-channel-manager] Pushed new branch CHANNELMGR-1039

[Ariel Weinberger]

Ariel Weinberger pushed new branch CHANNELMGR-1039 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] Deleted branch feature/visual-editing-psp2-CHANNELMGR-1292

[Mathijs den Burger]

Mathijs den Burger deleted branch feature/visual-editing-psp2-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-addon-channel-manager] Deleted branch feature/visual-editing-psp2

[Mathijs den Burger]

Mathijs den Burger deleted branch feature/visual-editing-psp2 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] Deleted branch feature/wpm

[Ard Schrijvers]

Ard Schrijvers deleted branch feature/wpm 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-project-archetype][master] 3 commits: ARCHE-531 Update HST configuration for WPM changes

[Ard Schrijvers]

Ard Schrijvers pushed to branch master at cms-community / 
hippo-project-archetype


Commits:
fd6e6dff by Tobias Jeger at 2017-05-31T15:49:07+02:00
ARCHE-531 Update HST configuration for WPM changes

- move hst:channel node into configuration/workspace

- - - - -
0dfc3b3a by Ard Schrijvers at 2017-06-08T16:50:42+02:00
ARCHE-531 reintegrate master changes

- - - - -
9c2985a8 by Ard Schrijvers at 2017-06-08T16:52:17+02:00
ARCHE-531 Reintegrate feature/wpm

- - - - -


3 changed files:

- 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hippoecm-extension.xml
- 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/channels.xml
 → 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/configurations/__rootArtifactId__/workspace/channel.xml
- 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/hosts.xml


Changes:

=
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hippoecm-extension.xml
=
--- 
a/src/main/resources/archetype-resources/repository-data/config/src/main/resources/hippoecm-extension.xml
+++ 
b/src/main/resources/archetype-resources/repository-data/config/src/main/resources/hippoecm-extension.xml
@@ -85,20 +85,6 @@
 
   
 
-  
-
-  hippo:initializeitem
-
-
-  30053
-
-
-  hst/channels.xml
-
-
-  /hst:hst
-
-  
   
 
   hippo:initializeitem
@@ -205,6 +191,21 @@
 
   
 
+  
+
+  hippo:initializeitem
+
+
+  30060
+
+
+  
hst/configurations/${rootArtifactId}/workspace/channel.xml
+
+
+  
/hst:hst/hst:configurations/${rootArtifactId.replace($hyphen,$empty)}/hst:workspace
+
+  
+
   
   
 


=
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/channels.xml
 → 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/configurations/__rootArtifactId__/workspace/channel.xml
=
--- 
a/src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/channels.xml
+++ 
b/src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/configurations/__rootArtifactId__/workspace/channel.xml
@@ -1,24 +1,17 @@
-#set( $hyphen = '-' )
-#set( $empty = '' )
 
-http://www.jcp.org/jcr/sv/1.0;>
+http://www.jcp.org/jcr/sv/1.0;>
   
-hst:channels
+hst:channel
   
-  
+  
+${projectName}
+  
+  
+website
+  
+  
 
-  hst:channel
-
-
-  ${projectName}
+  hst:channelinfo
 
-  
-website
-  
-
-  
-hst:channelinfo
-  
-
   
-
+
\ No newline at end of file


=
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/hosts.xml
=
--- 
a/src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/hosts.xml
+++ 
b/src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/hosts.xml
@@ -26,9 +26,6 @@
 
   hst:mount
 
-
-  
/hst:hst/hst:channels/${rootArtifactId.replace($hyphen,$empty)}
-
 
   
/hst:hst/hst:sites/${rootArtifactId.replace($hyphen,$empty)}
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-project-archetype/compare/6206a02599f8751931f6eaad5fdf81e61d1e8b05...9c2985a89d43f271c43490220bc216b5af6009d0
___
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][feature/wpm] 8 commits: ARCHE-530 add loggers for the default project package

[Ard Schrijvers]

Ard Schrijvers pushed to branch feature/wpm at cms-community / 
hippo-project-archetype


Commits:
76ff01af by Bert Leunis at 2017-05-30T09:15:35+02:00
ARCHE-530 add loggers for the default project package

- - - - -
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

- - - - -
5449b9dd by Tobias Jeger at 2017-06-07T09:39:28+02:00
ARCHE-534 Rename bootstrap folder to repository-data

We do this for better alignment with the new configuration management mechanism.
Also rename the configuration sub-module to just config.

- - - - -
b31a2fdf by Jeroen Hoffman at 2017-06-08T14:32:21+02:00
ARCHE-530 Merge branch master into feature/ARCHE-530

- - - - -
6206a025 by Jeroen Hoffman at 2017-06-08T14:48:20+02:00
ARCHE-530 Reintegrate branch feature/ARCHE-530

- - - - -
0dfc3b3a by Ard Schrijvers at 2017-06-08T16:50:42+02:00
ARCHE-531 reintegrate master changes

- - - - -


30 changed files:

- src/main/resources/META-INF/maven/archetype-metadata.xml
- src/main/resources/archetype-resources/README.txt
- src/main/resources/archetype-resources/cms/pom.xml
- src/main/resources/archetype-resources/cms/src/main/webapp/WEB-INF/web.xml
- src/main/resources/archetype-resources/conf/log4j2-dev.xml
- src/main/resources/archetype-resources/conf/log4j2-dist.xml
- src/main/resources/archetype-resources/pom.xml
- src/main/resources/archetype-resources/bootstrap/configuration/pom.xml → 
src/main/resources/archetype-resources/repository-data/config/pom.xml
- 
src/main/resources/archetype-resources/bootstrap/configuration/src/main/resources/configuration/modules/autoexport-module.xml
 → 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/configuration/modules/autoexport-module.xml
- 
src/main/resources/archetype-resources/bootstrap/configuration/src/main/resources/hippoecm-extension.xml
 → 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hippoecm-extension.xml
- 
src/main/resources/archetype-resources/bootstrap/configuration/src/main/resources/hst/configurations.xml
 → 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/configurations.xml
- 
src/main/resources/archetype-resources/bootstrap/configuration/src/main/resources/hst/configurations/__rootArtifactId__/abstractpages.xml
 → 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/configurations/__rootArtifactId__/abstractpages.xml
- 
src/main/resources/archetype-resources/bootstrap/configuration/src/main/resources/hst/configurations/__rootArtifactId__/catalog.xml
 → 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/configurations/__rootArtifactId__/catalog.xml
- 
src/main/resources/archetype-resources/bootstrap/configuration/src/main/resources/hst/configurations/__rootArtifactId__/components.xml
 → 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/configurations/__rootArtifactId__/components.xml
- 
src/main/resources/archetype-resources/bootstrap/configuration/src/main/resources/hst/configurations/__rootArtifactId__/pages.xml
 → 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/configurations/__rootArtifactId__/pages.xml
- 
src/main/resources/archetype-resources/bootstrap/configuration/src/main/resources/hst/configurations/__rootArtifactId__/prototypepages.xml
 → 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/configurations/__rootArtifactId__/prototypepages.xml
- 
src/main/resources/archetype-resources/bootstrap/configuration/src/main/resources/hst/configurations/__rootArtifactId__/sitemap.xml
 → 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/configurations/__rootArtifactId__/sitemap.xml
- 
src/main/resources/archetype-resources/bootstrap/configuration/src/main/resources/hst/configurations/__rootArtifactId__/sitemenus.xml
 → 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/configurations/__rootArtifactId__/sitemenus.xml
- 
src/main/resources/archetype-resources/bootstrap/configuration/src/main/resources/hst/configurations/__rootArtifactId__/templates.xml
 → 
src/main/resources/archetype-resources/repository-data/config/src/main/resources/hst/configurations/__rootArtifactId__/templates.xml
- 

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/wpm-CHANNELMGR-1272

[Joeri de Gooijer]

Joeri de Gooijer deleted branch feature/wpm-CHANNELMGR-1272 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] Deleted branch feature/wpm-CHANNELMGR-1271

[Joeri de Gooijer]

Joeri de Gooijer deleted branch feature/wpm-CHANNELMGR-1271 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] Deleted branch feature/wpm

[Michiel Eggermont]

Michiel Eggermont deleted branch feature/wpm 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-site-toolkit] Deleted branch feature/wpm

[Ard Schrijvers]

Ard Schrijvers deleted branch feature/wpm 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][master] 115 commits: HSTTWO-3959 Load channel nodes from below the hst:configuration node instead of below hst:channels

[Ard Schrijvers]

Ard Schrijvers pushed to branch master at cms-community / hippo-site-toolkit


Commits:
bd48e3ff by Ard Schrijvers at 2017-04-18T17:17:06+02:00
HSTTWO-3959 Load channel nodes from below the hst:configuration node instead of 
below hst:channels

Note : Unit and integration tests still need to be fixed

With this refactoring, channel nodes are from now on stored below the hst 
configuration, for example instead of
+ hst:hst
  + hst:channels
  | + myproject
  | |  + hst:channelinfo
  + hst:configurations
+ myproject

as

+ hst:hst
  + hst:channels
  + hst:configurations
+ myproject
  + hst:channel
+ hst:channelinfo

note that the /hst:hst/hst:channels node for now I kept, because based on this 
node,
a cms user is webmaster or admin on channels.

Next this, I also added support for hst:channel inheritance: Aka, if the 
hst:configuration
is inherited from another channel, the channel info is also inherited. In this 
case
the channel settings in the channel manager are not editable.

Also, the hst:channel node has to be in the hst:workspace to be editable! Thus 
even if the
hst:channel is not inherited, its settings are only editable if the 
channel info node is
in the hst:workspace, thus as follows:

+ hst:hst
  + hst:channels
  + hst:configurations
+ myproject
  + hst:workspace
+ hst:channel
  + hst:channelinfo

Since the hst:channel loading has now been completely changed, also caching is 
fixed: Aka,
channel loading now piggy backs on the same caching and invalidation mechanism 
as other
hst configuration objects.

Another improvement that has been done is the general hst preview creation: 
When creating
a preview, we only copy the hst:workspace from now on to preview, and have the 
preview
extend the live. Thus for example before we had:
+ hst:hst
  + hst:configurations
+ common
+ myproject (hst:inheritsfrom = ../common)
|  + hst:sitemap
|  + hst:pages
|  + hst:components
|  + hst:templates
|  + hst:workspace
+ myproject-preview (hst:inheritsfrom = ../common)
   + hst:sitemap
   + hst:pages
   + hst:components
   + hst:templates
   + hst:workspace

>From now on we have:

+ hst:hst
  + hst:configurations
+ common
+ myproject (hst:inheritsfrom = ../common)
|  + hst:sitemap
|  + hst:pages
|  + hst:components
|  + hst:templates
|  + hst:workspace
+ myproject-preview (hst:inheritsfrom = ../myproject)
   + hst:workspace

Note the preview inheriting from ../myproject (thus live!)

- - - - -
e9fbc14a by Michiel Eggermont at 2017-04-18T17:29:44+02:00
 HSTTWO-3968 Add branches field to Channel

  - Add field branches to Channel
  - Add TODOs to ChannelPropertyMapper to read/write branches

- - - - -
183f1cc8 by Michiel Eggermont at 2017-04-18T17:30:58+02:00
HSTTWO-3968 Add branches field to Channel

  - Add field branches to Channel
  - Add TODOs to ChannelPropertyMapper to read/write branches

- - - - -
c501cb29 by Ard Schrijvers at 2017-04-18T17:37:28+02:00
 HSTTWO-3959 correct setter

- - - - -
452f8ce7 by Ard Schrijvers at 2017-04-18T17:39:07+02:00
HSTTWO-3930 set correct wpm version

- - - - -
ce9a14be by Arent-Jan Banck at 2017-04-18T22:35:02+02:00
HSTTWO-3930 Revert update of the cms and repository wpm versions. The related 
branches no longer exists.
- - - - -
a0ea89db by Ard Schrijvers at 2017-04-19T17:17:16+02:00
HSTTWO-3971 Support to fetch Channel list per HST webapp via shared 
HippoServiceRegistry

Note per HST webapp, only the Channel objects that belong to the current HST 
webapp (context path)
are returned.

- - - - -
c5488fe8 by Ard Schrijvers at 2017-04-19T20:35:14+02:00
HSTTWO-3971 rely on services api master

- - - - -
17b24651 by Ard Schrijvers at 2017-04-19T20:39:37+02:00
HSTTWO-3971 rely on services wpm snapshot

- - - - -
ae713297 by Ard Schrijvers at 2017-04-20T13:36:48+02:00
HSTTWO-3959 Account for channel node being part of hst configuration

The hst channel does not need to be removed separately any more

- - - - -
44db0aab by Michiel Eggermont at 2017-04-20T13:49:08+02:00
HSTTWO-3968 Set branchId instead of branches

Due to change in Channel, we have to set the branchId instead of
branches.

- - - - -
c9f78962 by Ard Schrijvers at 2017-04-20T15:09:59+02:00
HSTTWO-3959 Account for channel node being part of hst configuration

Moved the channel nodes into the hst configuration nodes

- - - - -
96c717c9 by Michiel Eggermont at 2017-04-20T15:19:00+02:00
HSTTWO-3968 Put hippo-services on classpath

Otherwise EasyMock cannot find the class.

- - - - -
940aca08 by Ard Schrijvers at 2017-04-20T17:48:24+02:00
HSTTWO-3963 Fix blueprint handling and unit tests

One open issue still, see HSTTWO_3976

- - - - -
e81dd069 by Ard Schrijvers at 2017-04-20T18:19:23+02:00
HSTTWO-3959 Fix unit tests to correctly remove channel nodes (from the new 
location)

Also make sure the HST model doesnt break when a hst configuration misses
a sitemap

- - - - -
be1cf49a by Ard 

[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] JCR-4137: Release Jackrabbit 2.15.3 - Candidate Release Notes

[GitLab Mirror]

GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit


Commits:
98fee87d by Julian Reschke at 2017-06-08T13:47:41+00:00
JCR-4137: Release Jackrabbit 2.15.3 - Candidate Release Notes

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1798059 
13f79535-47bb-0310-9956-ffa450edef68

- - - - -


1 changed file:

- RELEASE-NOTES.txt


Changes:

=
RELEASE-NOTES.txt
=
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,34 +1,32 @@
-Release Notes -- Apache Jackrabbit -- Version 2.15.2
+Release Notes -- Apache Jackrabbit -- Version 2.15.3
 
 Introduction
 
 
-This is Apache Jackrabbit(TM) 2.15.2, a fully compliant implementation of the
+This is Apache Jackrabbit(TM) 2.15.3, a fully compliant implementation of the
 Content Repository for Java(TM) Technology API, version 2.0 (JCR 2.0) as
 specified in the Java Specification Request 283 (JSR 283).
 
-Apache Jackrabbit 2.15.2 is an unstable release cut directly from
+Apache Jackrabbit 2.15.3 is an unstable release cut directly from
 Jackrabbit trunk, with a focus on new features and other
 improvements. For production use we recommend the latest stable 2.14.x
 release.
 
-Changes in Jackrabbit 2.15.2
+Changes in Jackrabbit 2.15.3
 
 
 Bug
 
-[JCR-4118] - RepositoryChecker creates invalid node names
-[JCR-4121] - ConcurrentModificationException in 
InternalVersionHistoryImpl.fixLegacy()
-[JCR-4133] - fix javadoc problems that are errors with JDK8
+[JCR-3901] - TCK LockManagerTest does not allow new JCR 2.0 functionality 
for lock token transfers
+[JCR-4135] - potential NPE in FSBackend
 
 Task
 
-[JCR-4112] - Require Java 8
-[JCR-4119] - Upgrade httpcomponents/httpmime to 4.5.3
-[JCR-4122] - align parent pom references with Oak
-[JCR-4127] - update to latest apache parent pom (18)
-[JCR-4128] - update maven plugins and require Maven 3.2.1
-[JCR-4129] - get rid of unused org.json dependency
+[JCR-4134] - update build instructions wrt Java versions
+[JCR-4139] - Update commons-fileupload dependency to 1.3.2
+[JCR-4140] - Update easymock dependency to 3.4
+[JCR-4142] - update junit dependency to 4.12
+[JCR-4143] - update findbugs dependency to 3.0.2
 
 In addition to the above-mentioned changes, this release contains
 all the changes included up to the Apache Jackrabbit 2.14.x release.



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

[HippoCMS-scm] [Git][cms-community/hippo-repository] Deleted branch feature/REPO-1630

[Woonsan Ko]

Woonsan Ko deleted branch feature/REPO-1630 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-repository] Deleted branch feature/REPO-1612

[Woonsan Ko]

Woonsan Ko deleted branch feature/REPO-1612 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-site-toolkit] Deleted branch feature/HSTTWO-3912

[Woonsan Ko]

Woonsan Ko deleted branch feature/HSTTWO-3912 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-testsuite] Deleted branch feature/circular-reference-test

[Woonsan Ko]

Woonsan Ko deleted branch feature/circular-reference-test 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-testsuite] Deleted branch bugfix/HSTTWO-4027

[Woonsan Ko]

Woonsan Ko deleted branch bugfix/HSTTWO-4027 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] Deleted branch feature/CMS-10754

[Woonsan Ko]

Woonsan Ko deleted branch feature/CMS-10754 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 feature/CMS-10596

[Woonsan Ko]

Woonsan Ko deleted branch feature/CMS-10596 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 feature/CMS-10596-2

[Woonsan Ko]

Woonsan Ko deleted branch feature/CMS-10596-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-cms] Deleted branch feature/CMS-10553

[Woonsan Ko]

Woonsan Ko deleted branch feature/CMS-10553 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 feature/CMS-10753

[Woonsan Ko]

Woonsan Ko deleted branch feature/CMS-10753 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-testsuite] Pushed new branch feature/HSTTWO-4038

[Michael Metternich]

Michael Metternich pushed new branch feature/HSTTWO-4038 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-site-toolkit][master] HSTTWO-4018 Rollback H2 version update

[Arent-Jan Banck]

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


Commits:
c7809d22 by Arent-Jan Banck at 2017-06-08T14:57:33+02:00
HSTTWO-4018 Rollback H2 version update

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
 
 0.6
 4.9.0
-1.4.195
+1.3.174
 
   
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/c7809d222e9d2c34c586da9aff16a4ce3498d6dc
___
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-530 add loggers for the default project package

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch master at cms-community / 
hippo-project-archetype


Commits:
76ff01af by Bert Leunis at 2017-05-30T09:15:35+02:00
ARCHE-530 add loggers for the default project package

- - - - -
b31a2fdf by Jeroen Hoffman at 2017-06-08T14:32:21+02:00
ARCHE-530 Merge branch master into feature/ARCHE-530

- - - - -
6206a025 by Jeroen Hoffman at 2017-06-08T14:48:20+02:00
ARCHE-530 Reintegrate branch feature/ARCHE-530

- - - - -


4 changed files:

- src/main/resources/META-INF/maven/archetype-metadata.xml
- src/main/resources/archetype-resources/conf/log4j2-dev.xml
- src/main/resources/archetype-resources/conf/log4j2-dist.xml
- src/main/resources/archetype-resources/site/src/test/resources/log4j2.xml


Changes:

=
src/main/resources/META-INF/maven/archetype-metadata.xml
=
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -35,11 +35,16 @@
 shared-lib-content-component.xml
   
 
+
+  conf
+  
+**/log*.xml
+  
+
 
   conf
   
-**/*.dtd
-**/*.xml
+context.xml
 **/*.properties
   
 


=
src/main/resources/archetype-resources/conf/log4j2-dev.xml
=
--- a/src/main/resources/archetype-resources/conf/log4j2-dev.xml
+++ b/src/main/resources/archetype-resources/conf/log4j2-dev.xml
@@ -1,11 +1,12 @@
+#set( $dollar = '$' )
 
 
 
   
 
 
-
+
   
   
   
@@ -14,8 +15,8 @@
 
 
 
-
+
   
   
   
@@ -24,8 +25,8 @@
 
 
 
-
+
   
   
 
@@ -121,6 +122,9 @@
   
 
 
+
+
+
 
   
   


=
src/main/resources/archetype-resources/conf/log4j2-dist.xml
=
--- a/src/main/resources/archetype-resources/conf/log4j2-dist.xml
+++ b/src/main/resources/archetype-resources/conf/log4j2-dist.xml
@@ -1,11 +1,12 @@
+#set( $dollar = '$' )
 
 
 
   
 
 
-
+
   
   
   
@@ -15,8 +16,8 @@
 
 
 
-
+
   
   
   
@@ -26,8 +27,8 @@
 
 
 
-
+
   
   
 
@@ -80,6 +81,9 @@
 
 
 
+
+
+
 
   
   


=
src/main/resources/archetype-resources/site/src/test/resources/log4j2.xml
=
--- a/src/main/resources/archetype-resources/site/src/test/resources/log4j2.xml
+++ b/src/main/resources/archetype-resources/site/src/test/resources/log4j2.xml
@@ -40,6 +40,9 @@
 
 
 
+
+
+
 
   
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-project-archetype/compare/5449b9dd967dffdd2a2c3ee56f6c9b66dd72dde7...6206a02599f8751931f6eaad5fdf81e61d1e8b05
___
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] Pushed new branch feature/HIPPLUG-1463

[Michael Metternich]

Michael Metternich pushed new branch feature/HIPPLUG-1463 at cms-community / 
hippo-plugin-taxonomy
___
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] Pushed new branch feature/HIPPLUG-1463

[Michael Metternich]

Michael Metternich pushed new branch feature/HIPPLUG-1463 at cms-community / 
hippo-plugin-selections
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll] Pushed new branch feature/HIPPLUG-1463

[Michael Metternich]

Michael Metternich pushed new branch feature/HIPPLUG-1463 at cms-community / 
hippo-plugin-poll
___
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/wpm] 35 commits: CHANNELMGR-1292 Added new icons

[Arent-Jan Banck]

Arent-Jan Banck pushed to branch feature/wpm at cms-community / 
hippo-addon-channel-manager


Commits:
70bb7119 by Ariel Weinberger at 2017-05-24T15:24:03+02:00
CHANNELMGR-1292 Added new icons

- Added new SVG icons (maximise/unmaximize right side panel, components overlay 
toggle).
- Made changes to the overlayToggle component, it is not possible to apply an 
icon by src (for example, path to an SVG file).

- - - - -
3d505e3e by Ariel Weinberger at 2017-05-24T15:25:52+02:00
CHANNELMGR-1292 Fixed unit tests for overlayToggle

- - - - -
12cf5b25 by Ariel Weinberger at 2017-06-01T10:51:49+02:00
CHANNELMGR-1282 overlayToggle component now uses native browser tooltips

- Using the title attribute of HTML.
- Updated copyrights

- - - - -
d04fb46c by Ariel Weinberger at 2017-06-01T10:55:35+02:00
Merge branch feature/CHANNELMGR-1282

- - - - -
f479235d by Ariel Weinberger at 2017-06-01T11:38:51+02:00
CHANNELMGR-1309 Implemented shared space toolbar

- Top and bottom toolbars are merged into one.
- Scroll to the focused field and compensate for the sliding toolbar for better 
UX.
- Apply focus styling to match the rest of the rightSidePanel fields.
- Cleaned the style of rightSidePanel CKEditor and using material color scheme.
- Disabled resize handler.
- Added autogrow plugin.

- - - - -
0e0e825c by Ariel Weinberger at 2017-06-01T12:59:33+02:00
CHANNELMGR-1309 Added sharedspace toolbar imports

- - - - -
0c39912d by Ariel Weinberger at 2017-06-01T16:17:55+02:00
CHANNELMGR-1309 Added conditional for showing the bottom toolbar

- - - - -
737307ef by Ariel Weinberger at 2017-06-01T16:27:43+02:00
CHANNELMGR-1309 Fixed z-index and transition for shared toolbar

- - - - -
7c7a7567 by Ariel Weinberger at 2017-06-01T17:03:30+02:00
CHANNELMGR-1309 Add comments in sharedspace-toolbar HTML and repalce null with 
angular.noop in sharedspace service

- - - - -
74c31a55 by Ariel Weinberger at 2017-06-02T10:31:42+02:00
CHANNELMGR-1309 Fixed a test for CKEditor

- - - - -
ae6a6903 by Ariel Weinberger at 2017-06-02T12:47:08+02:00
CHANNELMGR-1309 Removed unused ckeditor Sass file

- - - - -
f3fafe69 by Ariel Weinberger at 2017-06-02T13:25:52+02:00
CHANNELMGR-1309 Removed unused ckeditor Sass file

- - - - -
5bc1d38b by Ariel Weinberger at 2017-06-02T13:26:03+02:00
CHANNELMGR-1309 Added unit tests for sharedspace-toolbar service

- - - - -
7bd99751 by Ariel Weinberger at 2017-06-02T13:26:03+02:00
CHANNELMGR-1309 Added unit tests for sharedspace toolbar component controller

- - - - -
4fcf20ba by Ariel Weinberger at 2017-06-02T13:38:36+02:00
CHANNELMGR-1309 Changed CKEditor source dialog font to monospace

- - - - -
64bd6ba0 by Ariel Weinberger at 2017-06-02T14:01:30+02:00
Merge branch feature/CHANNELMGR-1309

- - - - -
350a2989 by Ariel Weinberger at 2017-06-02T14:09:53+02:00
CHANNELMGR-1322 Changed resize handle icon to angular material more_vert and 
expanded handle height

- - - - -
fcdaa38c by Ariel Weinberger at 2017-06-02T14:10:19+02:00
Merge branch feature/CHANNELMGR-1322

- - - - -
62e350f8 by Ariel Weinberger at 2017-06-02T16:14:13+02:00
CHANNELMGR-1315 Fixed resize handle resizing limitation

- The limit of the resize handle is now determined by the actual width of the 
right side panel, rather than the mouse travel distance.

- - - - -
558d1c68 by Ariel Weinberger at 2017-06-02T16:22:44+02:00
CHANNELMGR-1315 Fixed an issue where the rightSidePanel would get stuck

- - - - -
87869e0b by Ariel Weinberger at 2017-06-02T16:50:00+02:00
CHANNELMGR-1300 Fix right side panel appearing when changing channels

- - - - -
62678323 by Arthur Bogaart at 2017-06-06T10:19:46+02:00
CHANNELMGR-1308 Fix for moved constant

- - - - -
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

- - - - -
218492e7 by Ariel Weinberger at 2017-06-06T16:43:31+02:00
CHANNELMGR-1292 Replaced icons with the new, fixed icons

- - - - -
a92c72ec by Ariel Weinberger at 2017-06-06T16:59:15+02:00
Merge branch feature/CHANNELMGR-1292

- - - - -
18ae6d76 by Ariel Weinberger at 2017-06-07T12:30:01+02:00
CHANNELMGR-1310 Hide channel toolbar when right side panel is in full width

Channel toolbar will be hidden as long as right side panel is in full width 
mode.
Closing the side panel or switching to another channel will show the toolbar 
again.

- - - - -
5336ec82 by Ariel Weinberger at 2017-06-07T12:30:55+02:00
CHANNELMGR-1309 Fixed Sasslint warnings

- - - - -
f1296c0a by Ariel Weinberger at 2017-06-07T16:34:00+02:00
CHANNELMGR-1310 Add unit tests for channel toolbar display toggle and moved 
logic

Add unit tests to ChannelService and ChannelController.
Moved setToolbarDisplayed logic from ChannelController to 
ChannelService.clearChannel().

- - - - -
e5cccb13 by Ariel Weinberger at 2017-06-07T16:36:46+02:00
CHANNELMGR-1310 Change fdescribe to describe in unit tests block

- - - - -
4f1f68af by Ariel Weinberger at 2017-06-07T16:38:07+02:00
Merge branch 

[HippoCMS-scm] [Git][cms-community/hippo-plugin-content-blocks] Pushed new branch feature/HIPPLUG-1463

[Michael Metternich]

Michael Metternich pushed new branch feature/HIPPLUG-1463 at cms-community / 
hippo-plugin-content-blocks
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-plugin-dashboard-document-wizard] Pushed new branch feature/HIPPLUG-1463

[Michael Metternich]

Michael Metternich pushed new branch feature/HIPPLUG-1463 at cms-community / 
hippo-plugin-dashboard-document-wizard
___
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-1308

[Arthur Bogaart]

Arthur Bogaart deleted 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-addon-channel-manager][master] 2 commits: CHANNELMGR-1308 Fix for moved constant

[Arthur Bogaart]

Arthur Bogaart pushed to branch master at cms-community / 
hippo-addon-channel-manager


Commits:
62678323 by Arthur Bogaart at 2017-06-06T10:19:46+02:00
CHANNELMGR-1308 Fix for moved constant

- - - - -
53379ddc by Arthur Bogaart at 2017-06-08T13:00:09+02:00
CHANNELMGR-1308 Reintegrate bugfix/CHANNELMGR-1308

- - - - -


1 changed file:

- 
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldType.java


Changes:

=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldType.java
=
--- 
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldType.java
+++ 
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldType.java
@@ -25,9 +25,6 @@ import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
 import org.apache.commons.lang.StringUtils;
 import org.hippoecm.repository.HippoStdNodeType;
 import org.hippoecm.repository.util.JcrUtils;
@@ -43,12 +40,16 @@ import org.onehippo.cms7.services.htmlprocessor.Tag;
 import org.onehippo.cms7.services.htmlprocessor.TagVisitor;
 import org.onehippo.cms7.services.htmlprocessor.model.HtmlProcessorModel;
 import org.onehippo.cms7.services.htmlprocessor.model.Model;
+import 
org.onehippo.cms7.services.htmlprocessor.richtext.image.RichTextImageTagProcessor;
 import org.onehippo.cms7.services.htmlprocessor.richtext.jcr.JcrNodeFactory;
 import 
org.onehippo.cms7.services.htmlprocessor.richtext.model.RichTextProcessorModel;
-import org.onehippo.cms7.services.htmlprocessor.richtext.visit.ImageVisitor;
+import org.onehippo.cms7.services.htmlprocessor.visit.FacetTagProcessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * A document field of type hippostd:html.
  *
@@ -263,11 +264,11 @@ public class RichTextFieldType extends 
FormattedTextFieldType implements NodeFie
 @Override
 public void onRead(final Tag parent, final Tag tag) throws 
RepositoryException {
 if (tag != null
-&& StringUtils.equalsIgnoreCase(ImageVisitor.TAG_IMG, 
tag.getName())
-&& tag.hasAttribute(ImageVisitor.ATTRIBUTE_SRC)
-&& tag.hasAttribute(ImageVisitor.ATTRIBUTE_DATA_UUID)) {
-final String src = 
tag.getAttribute(ImageVisitor.ATTRIBUTE_SRC);
-tag.addAttribute(ImageVisitor.ATTRIBUTE_SRC, pathPrefix + src);
+&& 
StringUtils.equalsIgnoreCase(RichTextImageTagProcessor.TAG_IMG, tag.getName())
+&& 
tag.hasAttribute(RichTextImageTagProcessor.ATTRIBUTE_SRC)
+&& 
tag.hasAttribute(FacetTagProcessor.ATTRIBUTE_DATA_UUID)) {
+final String src = 
tag.getAttribute(RichTextImageTagProcessor.ATTRIBUTE_SRC);
+tag.addAttribute(RichTextImageTagProcessor.ATTRIBUTE_SRC, 
pathPrefix + src);
 }
 }
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/759deba0502f841a856df0cbaba02529da33bbd5...53379ddc98c58b775603fd634318f3d2e9163275
___
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] Deleted branch feature/HHP-4

[Arthur Bogaart]

Arthur Bogaart deleted 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-repository][bugfix/REPO-1661] 16 commits: REPO-1649 Set Visual Editing PSP2 development version

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch bugfix/REPO-1661 at cms-community / 
hippo-repository


Commits:
1e564044 by Arthur Bogaart at 2017-04-06T17:35:26+02:00
REPO-1649 Set Visual Editing PSP2 development version

- - - - -
1d914470 by Arthur Bogaart at 2017-04-07T02:20:05+02:00
REPO-1605 Add dependency on hippo htmlprocessor

- - - - -
6703e316 by Arthur Bogaart at 2017-04-07T11:08:51+02:00
REPO-1605 Add htmlprocessor service dependency

- - - - -
a57c541b by Arthur Bogaart at 2017-04-10T14:26:07+02:00
REPO-1605 Set hippo-services-htmlprocessor version to 1.0.0-SNAPSHOT

- - - - -
ea3a3f5a by Arthur Bogaart at 2017-04-13T15:56:17+02:00
REPO-1649 Merge master changes into feature/visual-editing-psp2

- - - - -
60682f9b by Mathijs den Burger at 2017-04-24T09:31:28+02:00
REPO-1649 Merge master changes into feature/visual-editing-psp2

- - - - -
f2c6adb7 by Mathijs den Burger at 2017-05-23T12:21:11+02:00
REPO-1649 Merge master changes into feature/visual-editing-psp2

- - - - -
5436f421 by Mathijs den Burger at 2017-05-24T15:39:24+02:00
REPO-1649 Reintegrate feature/visual-editing-psp2

- - - - -
35aff41d by Arthur Bogaart at 2017-05-26T14:48:25+02:00
REPO-1605 Remove dependency on htmlprocessor

Necessary interfaces are now available in hippo-services-api

- - - - -
98915aac by Ate Douma at 2017-05-29T19:43:00+02:00
REPO-1 cleanup repository-config and repository-engine entanglement

repository-config really only need/should provide the base configuration, not 
depend on the engine for a simple StringCodecTest,
which has no functional place in the repository-config module but should be 
part of the repository-engine itself.
Hence, the repository-engine now can (as it should) depend on the 
repository-config module instead.

- - - - -
294574c4 by Ate Douma at 2017-05-30T08:23:48+02:00
REPO-1 cleanup and fix *all* unnecessary test warnings and stacktraces

- - - - -
39c663a6 by Ate Douma at 2017-05-30T11:26:20+02:00
REPO-1 bump to junit 4.12 and fix backwards-incompatibility usage of 
hamcrest-core 1.1-1.3

- - - - -
6856a81e by Ate Douma at 2017-05-31T10:50:57+02:00
REPO-1 fix dependency on junit which needs to be compile instead of (now) 
default test for testutils module

- - - - -
7c073da1 by Jeroen Hoffman at 2017-06-06T16:46:52+02:00
REPO-1695 avoid NPE in ServicingSearchIndex#updateNodes by simple null checks 
after .next() calls

- - - - -
18a1ee7b by Jasper Floor at 2017-06-08T09:34:28+02:00
REPO-1695 Reintegrate bugfix/REPO-1695

- - - - -
2c8d35a1 by Jeroen Hoffman at 2017-06-08T11:25:19+02:00
REPO-1661 Merge branch master into bugfix/REPO-1661

- - - - -


30 changed files:

- api/pom.xml
- api/src/test/java/org/hippoecm/repository/util/DocumentUtilsTest.java
- api/src/test/java/org/hippoecm/repository/util/SingleValueGetterImplTest.java
- config/src/test/resources/log4j2.xml → api/src/test/resources/log4j2.xml
- builtin/pom.xml
- builtin/src/test/java/org/hippoecm/repository/util/WorkflowUtilsTest.java
- + builtin/src/test/resources/log4j2.xml
- config/pom.xml
- dependencies/pom.xml
- 
deprecated/facetselectmirror/src/test/java/org/hippoecm/repository/FacetSelectTest.java
- engine/pom.xml
- 
engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingSearchIndex.java
- engine/src/test/java/org/hippoecm/repository/AuthorizationSanityTest.java
- engine/src/test/java/org/hippoecm/repository/EnhancedExportImportTest.java
- engine/src/test/java/org/hippoecm/repository/HREPTWO3402IssueTest.java
- engine/src/test/java/org/hippoecm/repository/ImpersonateTest.java
- engine/src/test/java/org/hippoecm/repository/NodeIndexerTest.java
- engine/src/test/java/org/hippoecm/repository/RefreshTest.java
- engine/src/test/java/org/hippoecm/repository/RepositoryMapTest.java
- config/src/test/java/org/hippoecm/repository/StringCodecTest.java → 
engine/src/test/java/org/hippoecm/repository/StringCodecTest.java
- engine/src/test/java/org/hippoecm/repository/WorkflowManagerTest.java
- engine/src/test/java/org/onehippo/repository/modules/ModuleManagerTest.java
- − engine/src/test/resources/domain-defaultread.xml
- − engine/src/test/resources/domain-defaultwrite.xml
- − engine/src/test/resources/group-everybody.xml
- engine/src/test/resources/hippoecm-extension.xml
- engine/src/test/resources/log4j2.xml
- − engine/src/test/resources/role-jcrread.xml
- − engine/src/test/resources/role-jcrwrite.xml
- jaxrs/pom.xml


The diff was not included because it is too large.


View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/compare/2118b0547d8eae83954ce45427f87751a8e081a2...2c8d35a19e0b97ea62c175472c71aa41cca907b9
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-services-webfiles][master] CMS-10775 adding multiple to initialize item as well

[Oscar Scholten]

Oscar Scholten pushed to branch master at cms-community / 
hippo-services-webfiles


Commits:
aeb0869f by Oscar Scholten at 2017-06-08T12:37:30+02:00
CMS-10775 adding multiple to initialize item as well

- - - - -


1 changed file:

- src/main/resources/hippoecm-extension.xml


Changes:

=
src/main/resources/hippoecm-extension.xml
=
--- a/src/main/resources/hippoecm-extension.xml
+++ b/src/main/resources/hippoecm-extension.xml
@@ -67,7 +67,7 @@
 
   
/hippo:configuration/hippo:modules/webfiles/hippo:moduleconfig/watchedModules
 
-
+
   repository-data/webfiles
 
   



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

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

[Tobias Jeger]

Tobias Jeger deleted 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-testsuite][release/3.2] HSTTWO-4034: Adding an example custom InternalLocationMapperEntries.

[Tobias Jeger]

Tobias Jeger pushed to branch release/3.2 at cms-community / hippo-testsuite


Commits:
3c844b07 by Woonsan Ko at 2017-06-06T13:19:10-04:00
HSTTWO-4034: Adding an example custom InternalLocationMapperEntries.

- - - - -


3 changed files:

- + 
cms/src/main/java/org/onehippo/cms7/testsuite/cms/demo/MyCustomInternalLocationMapperEntries.java
- dependencies/cms/pom.xml
- pom.xml


Changes:

=
cms/src/main/java/org/onehippo/cms7/testsuite/cms/demo/MyCustomInternalLocationMapperEntries.java
=
--- /dev/null
+++ 
b/cms/src/main/java/org/onehippo/cms7/testsuite/cms/demo/MyCustomInternalLocationMapperEntries.java
@@ -0,0 +1,64 @@
+/*
+ *  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.onehippo.cms7.testsuite.cms.demo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.onehippo.cms7.autoexport.InternalLocationMapperEntries;
+
+/**
+ * An example custom InternalLocationMapperEntries implementation 
to override mapping entries used
+ * by auto-export module. This example overrides the behavior of auto-export 
for updater script items and HST container
+ * component items, just for demonstration purpose.
+ * 
+ * Note: This example is not supposed to be copied or used in real 
development projects without full understandings
+ * and this kind of customization is not guaranteed to work as-is in the 
future product upgrades. Developers for
+ * end projects are required to understand what this kind of customization 
means and what kind of things they need
+ * to do by themselves in the future product upgrade process, for instance.
+ * 
+ */
+public class MyCustomInternalLocationMapperEntries extends 
InternalLocationMapperEntries {
+
+private List customEntries;
+
+@Override
+protected List getEntries() {
+if (customEntries == null) {
+List tempEntries = new ArrayList<>();
+tempEntries.addAll(super.getEntries());
+
+// /hippo:configuration/hippo:update/hippo:registry/*
+String[] nodePatterns = new String[] { 
"/hippo:configuration/hippo:update/hippo:registry/" + NAME };
+String[] propertyPatterns = new String[] { 
"/hippo:configuration/hippo:update/hippo:registry/" + NAME + "/" + ANY };
+String contextNode = 
"/hippo:configuration/hippo:update/hippo:registry/$1";
+String file = "configuration/update/registry/$1.xml";
+tempEntries.add(0, createEntry(nodePatterns, propertyPatterns, 
contextNode, file));
+
+// 
/hst:hst/hst:configurations/project/hst:workspace/hst:containers/*/*
+nodePatterns = new String[] { "/hst:hst/hst:configurations/" + 
NAME + "/hst:workspace/hst:containers/" + NAME + "/" + NAME };
+propertyPatterns = new String[] { "/hst:hst/hst:configurations/" + 
NAME + "/hst:workspace/hst:containers/" + NAME + "/" + NAME + "/" + ANY };
+contextNode = 
"/hst:hst/hst:configurations/$1/hst:workspace/hst:containers/$2/$3";
+file = "hst/configurations/$1/workspace/containers/$2/$3.xml";
+tempEntries.add(1, createEntry(nodePatterns, propertyPatterns, 
contextNode, file));
+
+customEntries = tempEntries;
+}
+
+return customEntries;
+}
+
+}


=
dependencies/cms/pom.xml
=
--- a/dependencies/cms/pom.xml
+++ b/dependencies/cms/pom.xml
@@ -104,6 +104,12 @@
 hippo-plugin-resourcebundle-editor
 
 
+
+
+  org.onehippo.cms7
+  hippo-cms-automatic-export-repository
+
+
   
 
 


=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -246,6 +246,9 @@
   true
   ${solr.data.dir}
   ${project.basedir}
+  
 
   
   



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

[HippoCMS-scm] [onehippo/ckeditor] 34cf8c: CMS-10778 Refactor unit test so it does not rely o...

[GitHub]

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

  Changed paths:
M config/pom.xml
M config/src/test/java/org/onehippo/ckeditor/JsonTest.java

  Log Message:
  ---
  CMS-10778 Refactor unit test so it does not rely on Jackson behavior

Newer versions of Jackson don't throw a JsonProcessingException
when asked to pretty-print an EasyMock object. So mock the pretty
printer instead and make it throw a JsonProcessingException.

All hail Whitebox for making it possible to mock a private static
final field.


  Commit: 5f65dddf64cea66cd4ba0ed8d6c585bafac4a854
  
https://github.com/onehippo/ckeditor/commit/5f65dddf64cea66cd4ba0ed8d6c585bafac4a854
  Author: Mathijs den Burger 
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
A config/src/test/resources/log4j2.xml

  Log Message:
  ---
  CMS-10778 Add log4j2 config file


  Commit: 8df305458f367e58c04055fcf0947a3249cd25c2
  
https://github.com/onehippo/ckeditor/commit/8df305458f367e58c04055fcf0947a3249cd25c2
  Author: Mathijs den Burger 
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
M config/pom.xml
A config/src/test/resources/log4j-filters.txt
M config/src/test/resources/log4j2.xml

  Log Message:
  ---
  CMS-10778 Don't log expected warnings generated by unit tests


Compare: 
https://github.com/onehippo/ckeditor/compare/742532f25c82...8df305458f36___
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/11.1] CMS-16 Bump parent POM version to latest project POM SNAPSHOT

[Tobias Jeger]

Tobias Jeger pushed to branch release/11.1 at cms-community / hippo-cms-release


Commits:
513e45a2 by Tobias Jeger at 2017-06-08T11:53:45+02:00
CMS-16 Bump parent POM version to latest project POM SNAPSHOT

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   
 org.onehippo.cms7
 hippo-cms7-project
-28.7-SNAPSHOT
+28.8-SNAPSHOT
   
 
   hippo-cms7-release



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/513e45a2dd0dc2fd958f1b49f8bd45430d095d1d
___
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/11.2] CMS-16 Bump parent POM version to latest release/11 project POM SNAPSHOT

[Tobias Jeger]

Tobias Jeger pushed to branch release/11.2 at cms-community / hippo-cms-release


Commits:
53f3ab17 by Tobias Jeger at 2017-06-08T11:52:07+02:00
CMS-16 Bump parent POM version to latest release/11 project POM SNAPSHOT

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   
 org.onehippo.cms7
 hippo-cms7-project
-28.7-SNAPSHOT
+28.8-SNAPSHOT
   
 
   hippo-cms7-release



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/53f3ab175d9c2667fac23b775de297316e46ab00
___
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/CMS-10753-2

[Tobias Jeger]

Tobias Jeger deleted 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-cms-release] Deleted branch feature/CMS-10753

[Tobias Jeger]

Tobias Jeger deleted 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-project][master] CMS-10778 Rollback Update jackson2 to 2.8.8

[Arent-Jan Banck]

Arent-Jan Banck pushed to branch master at cms-community / hippo-cms-project


Commits:
586d8899 by Arent-Jan Banck at 2017-06-08T10:46:38+02:00
CMS-10778 Rollback Update jackson2 to 2.8.8

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,8 @@
 3.1.6
 2.0.1
 1.9.13
-2.8.8
+
+2.4.5
 4.2.6.RELEASE
 1.8.9 
 2.4.11



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-project/commit/586d8899e2659d337ad7326a2aa47a090832a736
___
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/11.2] CMS-10753: bump up cms version

[Tobias Jeger]

Tobias Jeger pushed to branch release/11.2 at cms-community / hippo-cms-release


Commits:
0d756a21 by Woonsan Ko at 2017-06-06T12:59:35-04:00
CMS-10753: bump up cms version

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 
4.2.1
 
3.2.1
 3.2.0
-4.2.3
+4.2.4-SNAPSHOT
 3.2.0
 3.2.0
 4.2.2-SNAPSHOT



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

[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10753-2] CMS-10753 Update copyright year

[Tobias Jeger]

Tobias Jeger pushed to branch feature/CMS-10753-2 at cms-community / hippo-cms


Commits:
075acd82 by Tobias Jeger at 2017-06-08T09:57:47+02:00
CMS-10753 Update copyright year

- - - - -


1 changed file:

- 
automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/LocationMapper.java


Changes:

=
automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/LocationMapper.java
=
--- 
a/automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/LocationMapper.java
+++ 
b/automatic-export/repository/src/main/java/org/onehippo/cms7/autoexport/LocationMapper.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2011-2013 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2011-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.



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

[HippoCMS-scm] [onehippo/ckeditor] f40565: CMS-10778 Revert "Reintegrate feature/visual-editi...

[GitHub]

  Branch: refs/heads/hippo/4.5.x
  Home:   https://github.com/onehippo/ckeditor
  Commit: f405655ae8e5bc26495759de363e50cf567294f7
  
https://github.com/onehippo/ckeditor/commit/f405655ae8e5bc26495759de363e50cf567294f7
  Author: Mathijs den Burger 
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
M .gitignore
R config/pom.xml
R config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java
R 
config/src/main/java/org/onehippo/ckeditor/DeclarativeKeystrokesConverter.java
R config/src/main/java/org/onehippo/ckeditor/HippoPicker.java
R config/src/main/java/org/onehippo/ckeditor/Json.java
R config/src/main/resources/ckeditor/hippocontents.css
R config/src/main/resources/ckeditor/hippostyles.js
R config/src/test/java/org/onehippo/ckeditor/CKEditorConfigTest.java
R 
config/src/test/java/org/onehippo/ckeditor/DeclarativeKeystrokesConverterTest.java
R config/src/test/java/org/onehippo/ckeditor/JsonTest.java
M dev/builder/build-config.js
M maven-distribution-optimized.xml
R plugins/hippopicker/icons/hidpi/pickimage.png
R plugins/hippopicker/icons/hidpi/pickinternallink.png
R plugins/hippopicker/icons/pickimage.png
R plugins/hippopicker/icons/pickinternallink.png
R plugins/hippopicker/lang/de.js
R plugins/hippopicker/lang/en.js
R plugins/hippopicker/lang/es.js
R plugins/hippopicker/lang/fr.js
R plugins/hippopicker/lang/nl.js
R plugins/hippopicker/lang/zh.js
R plugins/hippopicker/plugin.js
M pom.xml

  Log Message:
  ---
  CMS-10778 Revert "Reintegrate feature/visual-editing-psp2"

The merge of Visual Editing is only needed in Hippo 12.
Revert it on this branch so hippo/4.5.x effectively becomes
a Hippo 11 maintenance branch.

This reverts commit 71301199c2a72e8991bb0bc1432668262618c36e, reversing
changes made to 9938a74ec6f50f5fb15686cbae04b6191cfe20f6.


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

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

[Jasper Floor]

Jasper Floor deleted 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