[HippoCMS-scm] [onehippo/urlrewritefilter]

[Jeroen Hoffman]

  Branch: refs/heads/bugfix/HIPPLUG-1646
  Home:   https://github.com/onehippo/urlrewritefilter
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/urlrewritefilter] 488189: Releasing 4.0.4-h9: manual bump to 4.0.4-h10-SNAPS...

[Jeroen Hoffman]

  Branch: refs/heads/urlrewritefilter-4.0.x
  Home:   https://github.com/onehippo/urlrewritefilter
  Commit: 488189ce5df298389cdcef11bae6ba9eab08101a
  
https://github.com/onehippo/urlrewritefilter/commit/488189ce5df298389cdcef11bae6ba9eab08101a
  Author: Jeroen Hoffman 
  Date:   2020-02-13 (Thu, 13 Feb 2020)

  Changed paths:
M pom.xml

  Log Message:
  ---
  Releasing 4.0.4-h9: manual bump to 4.0.4-h10-SNAPSHOT after release plugin 
failed


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

[HippoCMS-scm] [onehippo/urlrewritefilter]

[Jeroen Hoffman]

  Branch: refs/tags/urlrewritefilter-4.0.4-h9
  Home:   https://github.com/onehippo/urlrewritefilter
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/urlrewritefilter] c574f7: [maven-release-plugin] prepare release urlrewritef...

[Jeroen Hoffman]

  Branch: refs/heads/urlrewritefilter-4.0.x
  Home:   https://github.com/onehippo/urlrewritefilter
  Commit: c574f7ee35b1b44693decedf8b84eb8522f7c462
  
https://github.com/onehippo/urlrewritefilter/commit/c574f7ee35b1b44693decedf8b84eb8522f7c462
  Author: Jeroen Hoffman 
  Date:   2020-02-13 (Thu, 13 Feb 2020)

  Changed paths:
M pom.xml

  Log Message:
  ---
  [maven-release-plugin] prepare release urlrewritefilter-4.0.4-h9


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

[HippoCMS-scm] [onehippo/urlrewritefilter] 768206: HIPPLUG-1646 URL rewriter: use URL "as is" and don...

[Jeroen Hoffman]

  Branch: refs/heads/urlrewritefilter-4.0.x
  Home:   https://github.com/onehippo/urlrewritefilter
  Commit: 768206fdb745874f530950f03088805a17285333
  
https://github.com/onehippo/urlrewritefilter/commit/768206fdb745874f530950f03088805a17285333
  Author: Marijan Milicevic 
  Date:   2020-02-10 (Mon, 10 Feb 2020)

  Changed paths:
M src/main/java/org/tuckey/web/filters/urlrewrite/RequestProxy.java

  Log Message:
  ---
  HIPPLUG-1646 URL rewriter: use URL "as is" and don't recreate it

- use URL as provided and avoid adding port numbers
- don't cast String parts


  Commit: 1120e9898c732e3e328f2b371801a40978e74fb8
  
https://github.com/onehippo/urlrewritefilter/commit/1120e9898c732e3e328f2b371801a40978e74fb8
  Author: Jeroen Hoffman 
  Date:   2020-02-13 (Thu, 13 Feb 2020)

  Changed paths:
M src/main/java/org/tuckey/web/filters/urlrewrite/RequestProxy.java

  Log Message:
  ---
  HIPPLUG-1646 make URL object 'final' again


  Commit: c071f45c4187b02175aef2d825c02e2f188c6ef8
  
https://github.com/onehippo/urlrewritefilter/commit/c071f45c4187b02175aef2d825c02e2f188c6ef8
  Author: Jeroen Hoffman 
  Date:   2020-02-13 (Thu, 13 Feb 2020)

  Changed paths:
M FORK_INFO.md

  Log Message:
  ---
  HIPPLUG-1646 releasing 4.0.4-h9: add release note


Compare: 
https://github.com/onehippo/urlrewritefilter/compare/f3a040e60a7b...c071f45c4187
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/urlrewritefilter] f3a040: Releasing h8: set next development version to 4.0....

[Jeroen Hoffman]

  Branch: refs/heads/urlrewritefilter-4.0.x
  Home:   https://github.com/onehippo/urlrewritefilter
  Commit: f3a040e60a7b67def39ad5118e344a60dac9e24d
  
https://github.com/onehippo/urlrewritefilter/commit/f3a040e60a7b67def39ad5118e344a60dac9e24d
  Author: Jeroen Hoffman 
  Date:   2019-10-18 (Fri, 18 Oct 2019)

  Changed paths:
M pom.xml

  Log Message:
  ---
  Releasing h8: set next development version to 4.0.4-h9-SNAPSHOT (release 
plugin failed)


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

[HippoCMS-scm] [onehippo/urlrewritefilter]

[Jeroen Hoffman]

  Branch: refs/tags/urlrewritefilter-4.0.4-h8
  Home:   https://github.com/onehippo/urlrewritefilter
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/urlrewritefilter] b00ebd: [maven-release-plugin] prepare release urlrewritef...

[Jeroen Hoffman]

  Branch: refs/heads/urlrewritefilter-4.0.x
  Home:   https://github.com/onehippo/urlrewritefilter
  Commit: b00ebd9623a0e1cb7574bbcc4364c070fa5714dc
  
https://github.com/onehippo/urlrewritefilter/commit/b00ebd9623a0e1cb7574bbcc4364c070fa5714dc
  Author: Jeroen Hoffman 
  Date:   2019-10-18 (Fri, 18 Oct 2019)

  Changed paths:
M pom.xml

  Log Message:
  ---
  [maven-release-plugin] prepare release urlrewritefilter-4.0.4-h8


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

[HippoCMS-scm] [onehippo/urlrewritefilter] 965c38: HIPPLUG-1595 add release note for 4.0.4-h7

[Jeroen Hoffman]

  Branch: refs/heads/urlrewritefilter-4.0.x
  Home:   https://github.com/onehippo/urlrewritefilter
  Commit: 965c38822c4552ddabd062ba0e502c1f27625b89
  
https://github.com/onehippo/urlrewritefilter/commit/965c38822c4552ddabd062ba0e502c1f27625b89
  Author: Jeroen Hoffman 
  Date:   2019-07-18 (Thu, 18 Jul 2019)

  Changed paths:
M FORK_INFO.md

  Log Message:
  ---
  HIPPLUG-1595 add release note for 4.0.4-h7


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

[HippoCMS-scm] [onehippo/urlrewritefilter]

[Jeroen Hoffman]

  Branch: refs/heads/bugfix/HIPPLUG-1587
  Home:   https://github.com/onehippo/urlrewritefilter
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/urlrewritefilter] 26d999: set next development version 4.0.4-h6-SNAPSHOT

[Jeroen Hoffman]

  Branch: refs/heads/urlrewritefilter-4.0.x
  Home:   https://github.com/onehippo/urlrewritefilter
  Commit: 26d999e3c14f786cc7aef687f234084980611a96
  
https://github.com/onehippo/urlrewritefilter/commit/26d999e3c14f786cc7aef687f234084980611a96
  Author: Jeroen Hoffman 
  Date:   2019-03-22 (Fri, 22 Mar 2019)

  Changed paths:
M pom.xml

  Log Message:
  ---
  set next development version 4.0.4-h6-SNAPSHOT


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

[HippoCMS-scm] [onehippo/urlrewritefilter] 97ca1d: HIPPLUG-1587 URLrewriter: accept CDATA as node values

[Jeroen Hoffman]

  Branch: refs/heads/urlrewritefilter-4.0.x
  Home:   https://github.com/onehippo/urlrewritefilter
  Commit: 97ca1d00df72dc64d1d0425c94f6d3a73c380750
  
https://github.com/onehippo/urlrewritefilter/commit/97ca1d00df72dc64d1d0425c94f6d3a73c380750
  Author: Marijan Milicevic 
  Date:   2019-03-19 (Tue, 19 Mar 2019)

  Changed paths:
M src/main/java/org/tuckey/web/filters/urlrewrite/Conf.java
M src/test/java/org/tuckey/web/filters/urlrewrite/ConfTest.java
M src/test/resources/org/tuckey/web/filters/urlrewrite/conf-test1.xml

  Log Message:
  ---
  HIPPLUG-1587 URLrewriter: accept CDATA as node values

- parse CDATA sections, add few testcases


  Commit: ef87a9a0a94f7eb412ac56e17fccd194ddde8b1b
  
https://github.com/onehippo/urlrewritefilter/commit/ef87a9a0a94f7eb412ac56e17fccd194ddde8b1b
  Author: Jeroen Hoffman 
  Date:   2019-03-22 (Fri, 22 Mar 2019)

  Changed paths:
M FORK_INFO.md

  Log Message:
  ---
  HIPPLUG-1587 add FORK_INFO note


  Commit: aae2f6a4c6aab059af9b89a4e2c9554345d8f8ef
  
https://github.com/onehippo/urlrewritefilter/commit/aae2f6a4c6aab059af9b89a4e2c9554345d8f8ef
  Author: Jeroen Hoffman 
  Date:   2019-03-22 (Fri, 22 Mar 2019)

  Changed paths:
M FORK_INFO.md
M src/main/java/org/tuckey/web/filters/urlrewrite/Conf.java
M src/test/java/org/tuckey/web/filters/urlrewrite/ConfTest.java
M src/test/resources/org/tuckey/web/filters/urlrewrite/conf-test1.xml

  Log Message:
  ---
  HIPPLUG-1587 Reintegrate branch 'bugfix/HIPPLUG-1587' into 
urlrewritefilter-4.0.x


  Commit: 9ce86706fbda73a35a782fb5c140ad67d048202e
  
https://github.com/onehippo/urlrewritefilter/commit/9ce86706fbda73a35a782fb5c140ad67d048202e
  Author: Jeroen Hoffman 
  Date:   2019-03-22 (Fri, 22 Mar 2019)

  Changed paths:
M pom.xml

  Log Message:
  ---
  [maven-release-plugin] prepare release urlrewritefilter-4.0.4-h5


Compare: 
https://github.com/onehippo/urlrewritefilter/compare/ff6c83048524...9ce86706fbda
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/urlrewritefilter]

[Jeroen Hoffman]

  Branch: refs/tags/urlrewritefilter-4.0.4-h5
  Home:   https://github.com/onehippo/urlrewritefilter
___
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 dashboard-document-wizard version to 3.2.3-SNAPSHOT on behalf of HIPPLUG-1523

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/11.2 at cms-community / 
hippo-cms-release


Commits:
0d34f076 by Jeroen Hoffman at 2018-03-28T16:34:18+02:00
CMS-16 bump dashboard-document-wizard version to 3.2.3-SNAPSHOT on behalf of 
HIPPLUG-1523

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
 
3.2.0
 
3.2.0
 
6.2.0
-
3.2.2
+
3.2.3-SNAPSHOT
 
3.2.0
 3.2.0
 4.2.1



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/0d34f07677025cc4bcce753d71433781a3f7a89b

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/0d34f07677025cc4bcce753d71433781a3f7a89b
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] Deleted branch bugfix/ESSENTIALS-1167

[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

[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-essentials] Deleted branch bugfix/ESSENTIALS-1086

[Jeroen Hoffman]

Jeroen Hoffman deleted branch bugfix/ESSENTIALS-1086 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-cms][feature/CMS-10840] 12 commits: CMS-11089 Renamed npm-shrinkwrap.json to package-lock.json

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/CMS-10840 at cms-community / hippo-cms


Commits:
558f46eb by Arthur Bogaart at 2018-02-22T16:49:53+01:00
CMS-11089 Renamed npm-shrinkwrap.json to package-lock.json

- - - - -
f7b206f6 by Arthur Bogaart at 2018-02-22T16:56:30+01:00
CMS-11089 Bump grunt-sass to prevent compilation of node-sass

- - - - -
5b05405c by Arthur Bogaart at 2018-02-23T09:31:51+01:00
CMS-11089 Rename npm-shrinkwrap and restrict build to node8  npm5

- - - - -
1e3dd7cf by Mathijs den Burger at 2018-02-23T09:57:11+01:00
CMS-11089 Reintegrate feature/CMS-11089

- - - - -
7c30d52c by Peter Centgraf at 2018-02-23T22:08:27+01:00
CMS-11000 Bump versions to prepare 12.3 development iteration

- - - - -
393adc01 by Ate Douma at 2018-02-26T01:20:40+01:00
CMS-11086 Upgrade to jackrabbit-2.16.1-h1 and Tika 1.17 (see: REPO-1950)

- - - - -
2e56861c by Mathijs den Burger at 2018-02-27T16:52:29+01:00
CMS-11098 Use Hippo CKEditor 4.7.1-h12.3.0-SNAPSHOT

- - - - -
411d2bf1 by Ate Douma at 2018-03-09T16:29:27+01:00
CMS-11122 Update to hippo htmldiff library 1.02.00 which no longer uses 
nekohtml but htmlcleaner

Dropping nekohtml also required replacing its direct usage in HtmlValidator and 
HtmlDiffModelTest with htmlcleaner.
Also replaced deprecated (Xerces provided) SAXSerializer usage for Console XML 
Content Export with standard JAXP XMLTransformer.

- - - - -
8e0a8789 by Arent-Jan Banck at 2018-03-09T16:33:17+01:00
CMS-11084 Update drewnoakes-extractor from 2.6.2 to 2.11.0. The library is used 
to verify an jpg is using YCCK. Note that ImageMetaData has been deprecated 
some versions ago so should be scheduled for removal.

(cherry picked from commit 8553b57af8bccbc857b9f0ee6a0f61f0bd7e7e67)

- - - - -
99826d09 by Ate Douma at 2018-03-12T00:31:56+01:00
CMS-11122 - htmldiff switched to semantic version 2.0.0

- - - - -
4c0a038f by Jeroen Hoffman at 2018-03-13T21:29:45+01:00
CMS-10840 Merge branch master into feature/CMS-10840

- - - - -
751da0bb by Jeroen Hoffman at 2018-03-14T11:31:21+01:00
CMS-10840 add unit tests for FieldPluginHelper.getCaptionModel

- - - - -


30 changed files:

- api/npm-shrinkwrap.json → api/package-lock.json
- api/package.json
- api/pom.xml
- api/src/main/java/org/hippoecm/frontend/editor/plugins/resource/PdfParser.java
- 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/imageutil/ImageBinary.java
- 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/imageutil/ImageMetaData.java
- 
api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/MagicMimeTypeFileItem.java
- automatic-export/frontend/pom.xml
- automatic-export/pom.xml
- automatic-export/repository/pom.xml
- brokenlinks/common/pom.xml
- brokenlinks/frontend/pom.xml
- brokenlinks/pom.xml
- brokenlinks/repository/pom.xml
- brokenlinks/test/pom.xml
- builtin/pom.xml
- config/pom.xml
- console/frontend/npm-shrinkwrap.json → console/frontend/package-lock.json
- console/frontend/package.json
- console/frontend/pom.xml
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/content/ContentExportDialog.java
- console/pom.xml
- console/repository/pom.xml
- dependencies/pom.xml
- editor/common/pom.xml
- editor/frontend/pom.xml
- 
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelper.java
- 
editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java
- + 
editor/frontend/src/test/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelperTest.java
- editor/pom.xml


The diff was not included because it is too large.


View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/6edd883fce6eb6d5777851f9eafc902bea3cfcdc...751da0bbda245e9c11cd4aba77ef69c39f3d6693

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/6edd883fce6eb6d5777851f9eafc902bea3cfcdc...751da0bbda245e9c11cd4aba77ef69c39f3d6693
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-cms-release][release/11.2] CMS-16 bump HST version to 4.2.7-SNAPSHOT on behalf of HSTTWO-4248

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/11.2 at cms-community / 
hippo-cms-release


Commits:
59714312 by Jeroen Hoffman at 2018-03-07T10:31:36+01:00
CMS-16 bump HST version to 4.2.7-SNAPSHOT on behalf of HSTTWO-4248

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
 4.2.11
 3.2.0
 3.2.0
-4.2.6
+4.2.7-SNAPSHOT
 4.2.0
 4.2.8-SNAPSHOT
 3.2.1



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/597143125fbfc1809ed3eeddaa97d9121a454312

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/597143125fbfc1809ed3eeddaa97d9121a454312
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-cms-release][release/11.2] CMS-16 bump repository version to 4.2.8-SNAPSHOT on behalf of REPO-1960

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/11.2 at cms-community / 
hippo-cms-release


Commits:
b5ffa739 by Jeroen Hoffman at 2018-03-07T10:26:56+01:00
CMS-16 bump repository version to 4.2.8-SNAPSHOT on behalf of REPO-1960

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 3.2.0
 4.2.6
 4.2.0
-4.2.7
+4.2.8-SNAPSHOT
 3.2.1
 
3.2.0
 
3.2.0



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/b5ffa7397260f3893f7cc26dc0b9ebdd387397c3
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][master] 4 commits: REPO-1869 prevent document variants from being counted as duplicates

[Jeroen Hoffman]

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


Commits:
558e52a7 by Jasper Floor at 2018-02-27T14:59:40+01:00
REPO-1869 prevent document variants from being counted as duplicates

- - - - -
0c15259e by Jeroen Hoffman at 2018-03-07T09:45:05+01:00
REPO-1869 remove parent-check logic: lot of code for a situation that is very 
very unlikely (2 or 3 found variants with different parent)

- - - - -
f69fe4e6 by Jeroen Hoffman at 2018-03-07T09:46:48+01:00
REPO-1869 simplify code

- - - - -
ff5cb5d3 by Jeroen Hoffman at 2018-03-07T10:03:13+01:00
REPO-1869 Reintegrate branch bugfix/REPO-1869 into master

- - - - -


1 changed file:

- 
builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java


Changes:

=
builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
=
--- 
a/builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
+++ 
b/builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2012-2013 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2012-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.
@@ -64,20 +64,24 @@ public final class HippoTranslatedNode {
 }
 
 public Node getTranslation(String language) throws RepositoryException {
-String id = node.getProperty(HippoTranslationNodeType.ID).getString();
-Query query = 
node.getSession().getWorkspace().getQueryManager().createQuery(
+final String id = 
node.getProperty(HippoTranslationNodeType.ID).getString();
+final Query query = 
node.getSession().getWorkspace().getQueryManager().createQuery(
 "SELECT * FROM " + HippoTranslationNodeType.NT_TRANSLATED
 + " WHERE " + HippoTranslationNodeType.ID + "='" + id 
+ "'"
 + " AND " + HippoTranslationNodeType.LOCALE + "='" + 
language + "'",
 Query.SQL);
 final QueryResult result = query.execute();
-NodeIterator nodes = result.getNodes();
+final NodeIterator nodes = result.getNodes();
 if (!nodes.hasNext()) {
-throw new ItemNotFoundException("Folder was not translated to " + 
language);
+throw new ItemNotFoundException("Node " + node.getPath() + " was 
not translated to " + language);
 }
-if (nodes.getSize() > 1) {
-log.warn("More than one translated variant found for node " + id + 
" in language " + language);
+
+if (nodes.getSize() > 3) {
+// check 3 for the stable draft/unpublished/published versions
+log.warn("Not a maximum of 3 but {} translated variants found for 
node {} with translation id {} and language {}.",
+nodes.getSize(), node.getPath(), id, language);
 }
+
 return nodes.nextNode();
 }
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/compare/4b64f92ed4d59d9317c30766a4a704d9cf391337...ff5cb5d301089dddf5ee3cf394a778ea8a53ea9a

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/compare/4b64f92ed4d59d9317c30766a4a704d9cf391337...ff5cb5d301089dddf5ee3cf394a778ea8a53ea9a
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][bugfix/REPO-1869] 2 commits: REPO-1869 remove parent-check logic: lot of code for a situation that is very…

[Jeroen Hoffman]

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


Commits:
0c15259e by Jeroen Hoffman at 2018-03-07T09:45:05+01:00
REPO-1869 remove parent-check logic: lot of code for a situation that is very 
very unlikely (2 or 3 found variants with different parent)

- - - - -
f69fe4e6 by Jeroen Hoffman at 2018-03-07T09:46:48+01:00
REPO-1869 simplify code

- - - - -


1 changed file:

- 
builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java


Changes:

=
builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
=
--- 
a/builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
+++ 
b/builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
@@ -64,33 +64,25 @@ public final class HippoTranslatedNode {
 }
 
 public Node getTranslation(String language) throws RepositoryException {
-String id = node.getProperty(HippoTranslationNodeType.ID).getString();
-Query query = 
node.getSession().getWorkspace().getQueryManager().createQuery(
+final String id = 
node.getProperty(HippoTranslationNodeType.ID).getString();
+final Query query = 
node.getSession().getWorkspace().getQueryManager().createQuery(
 "SELECT * FROM " + HippoTranslationNodeType.NT_TRANSLATED
 + " WHERE " + HippoTranslationNodeType.ID + "='" + id 
+ "'"
 + " AND " + HippoTranslationNodeType.LOCALE + "='" + 
language + "'",
 Query.SQL);
 final QueryResult result = query.execute();
-NodeIterator nodes = result.getNodes();
+final NodeIterator nodes = result.getNodes();
 if (!nodes.hasNext()) {
-throw new ItemNotFoundException("Folder was not translated to " + 
language);
+throw new ItemNotFoundException("Node " + node.getPath() + " was 
not translated to " + language);
 }
 
-Node node = nodes.nextNode();
 if (nodes.getSize() > 3) {
-log.warn("More than one translated variant found for node " + id + 
" in language " + language);
-} else if (nodes.getSize() > 1) {
-String handleId = null;
-Node parent = node.getParent();
-do {
-Node next = nodes.nextNode();
-if 
(!next.getParent().getIdentifier().equals(parent.getIdentifier())) {
-log.warn("More than one translated variant found for node 
" + id + " in language " + language);
-break;
-}
-} while (nodes.hasNext());
+// check 3 for the stable draft/unpublished/published versions
+log.warn("Not a maximum of 3 but {} translated variants found for 
node {} with translation id {} and language {}.",
+nodes.getSize(), node.getPath(), id, language);
 }
-return node;
+
+return nodes.nextNode();
 }
 
 public boolean hasTranslation(String language) throws RepositoryException {



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/compare/558e52a7072e201a2b04e84ade6ac87aaee551f6...f69fe4e6284dd30fe003c307b5c5344cb00e1de1

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/compare/558e52a7072e201a2b04e84ade6ac87aaee551f6...f69fe4e6284dd30fe003c307b5c5344cb00e1de1
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] Deleted branch feature/HSTTWO-4248

[Jeroen Hoffman]

Jeroen Hoffman deleted branch feature/HSTTWO-4248 at cms-community / 
hippo-site-toolkit

---

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][release/4.2] 2 commits: HSTTWO-4248 don't filter out ' backport of HSTTWO-4213

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/4.2 at cms-community / 
hippo-site-toolkit


Commits:
1a4c4272 by Jasper Floor at 2018-02-27T16:19:00+01:00
HSTTWO-4248 dont filter out  backport of HSTTWO-4213

- - - - -
02fc7454 by Jeroen Hoffman at 2018-03-06T15:37:26+01:00
HSTTWO-4248 Reintegrate branch feature/HSTTWO-4248 into release/4.2

- - - - -


2 changed files:

- content-beans/src/main/java/org/hippoecm/hst/util/SearchInputParsingUtils.java
- 
content-beans/src/test/java/org/hippoecm/hst/util/TestSearchInputParsingUtils.java


Changes:

=
content-beans/src/main/java/org/hippoecm/hst/util/SearchInputParsingUtils.java
=
--- 
a/content-beans/src/main/java/org/hippoecm/hst/util/SearchInputParsingUtils.java
+++ 
b/content-beans/src/main/java/org/hippoecm/hst/util/SearchInputParsingUtils.java
@@ -271,10 +271,7 @@ public final class SearchInputParsingUtils {
 sb.append('\\');
 sb.append(c);
 } else if (c == '\'') {
-// the jackrabbit xpath builder breaks on \' (however it 
should be possible according spec)
-if (retainWordBoundaries) {
-sb.append(' ');
-} // else skip it to provide old behavior
+sb.append("''");
 } else if (c == ' ') {
 // next term. set allowWildCardInCurrentTerm again to 
allowSingleNonLeadingWildCardPerTerm
 allowWildCardInCurrentTerm = 
allowSingleNonLeadingWildCardPerTerm;


=
content-beans/src/test/java/org/hippoecm/hst/util/TestSearchInputParsingUtils.java
=
--- 
a/content-beans/src/test/java/org/hippoecm/hst/util/TestSearchInputParsingUtils.java
+++ 
b/content-beans/src/test/java/org/hippoecm/hst/util/TestSearchInputParsingUtils.java
@@ -154,17 +154,17 @@ public class TestSearchInputParsingUtils {
 
 @Test
 public void testSearchInputParsingUtils_parse_retainWordBoundaries() 
throws Exception {
-assertEquals("I me love Ben Jerrie s?", 
SearchInputParsingUtils.parse("I(me) love Ben's?", true, true));
-assertEquals("I me love Ben Jerrie s", 
SearchInputParsingUtils.parse("I(me) love Ben's?", false, true));
-assertEquals("Ime love BenJerries?", 
SearchInputParsingUtils.parse("I[me] love Ben's?", true, false));
-assertEquals("Ime love BenJerries", 
SearchInputParsingUtils.parse("I[me] love Ben's?", false, false));
-assertEquals("The quick \\\"brown\\\" fox can t jump 32.3 feet, 
right", SearchInputParsingUtils.parse("The quick (“brown”) fox can’t jump 32.3 
feet, right?\n", false, true));
-assertEquals("The quick \\\"brown\\\" fox can t jump 32.3 feet, 
right?", SearchInputParsingUtils.parse("The quick (“brown”) fox can’t jump 32.3 
feet, right?\n", true, true));
+assertEquals("I me love Ben Jerrie''s?", 
SearchInputParsingUtils.parse("I(me) love Ben's?", true, true));
+assertEquals("I me love Ben Jerrie''s", 
SearchInputParsingUtils.parse("I(me) love Ben's?", false, true));
+assertEquals("Ime love BenJerrie''s?", 
SearchInputParsingUtils.parse("I[me] love Ben's?", true, false));
+assertEquals("Ime love BenJerrie''s", 
SearchInputParsingUtils.parse("I[me] love Ben's?", false, false));
+assertEquals("The quick \\\"brown\\\" fox can''t jump 32.3 feet, 
right", SearchInputParsingUtils.parse("The quick (“brown”) fox can’t jump 32.3 
feet, right?\n", false, true));
+assertEquals("The quick \\\"brown\\\" fox can''t jump 32.3 feet, 
right?", SearchInputParsingUtils.parse("The quick (“brown”) fox can’t jump 32.3 
feet, right?\n", true, true));
 assertEquals("The quick !brown*", SearchInputParsingUtils.parse("The 
quick! !brown*", true, true));
 assertEquals("The quick !brown", SearchInputParsingUtils.parse("The 
quick! !brown*", false, true));
 
-assertEquals("The quick br own", SearchInputParsingUtils.parse("The 
quick br*'own", false, true));
-assertEquals("The quick br* own", SearchInputParsingUtils.parse("The 
quick br*'own", true, true));
+assertEquals("The quick br''own", SearchInputParsingUtils.parse("The 
quick br*'own", false, true));
+assertEquals("The quick br*''own", SearchInputParsingUtils.parse("The 
quick br*'own", true, true));
 }
 
 @Test
@@ -201,12 +201,12 @@ public class TestSearchInputParsingUtils {
 
 @Test
 public void testSearchInputParsingUti

[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/11.2] CMS-11068 bump CMS version to 4.2.11-SNAPSHOT

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/11.2 at cms-community / 
hippo-cms-release


Commits:
ac10f63f by Jeroen Hoffman at 2018-02-14T14:09:09+01:00
CMS-11068 bump CMS version to 4.2.11-SNAPSHOT

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 
4.2.5
 
3.2.1
 3.2.0
-4.2.10
+4.2.11-SNAPSHOT
 3.2.0
 3.2.0
 4.2.6



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/ac10f63f3494abd2fcdb824ab6cade01f70f4926
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-cms-translations][release/11.2] 5 commits: CMS-11068 [back port to 11.2] Error in calendardate field in hippo

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/11.2 at cms-community / 
hippo-cms-translations


Commits:
4591d2c2 by Marijan Milicevic at 2018-02-14T12:00:51+01:00
CMS-11068 [back port to 11.2] Error in calendardate field in hippo
- add date only tooltip and label

(cherry picked from commit 94c948230db6113ec25338e44ee3737d0bb2bc38)

- - - - -
27b5950b by Marijan Milicevic at 2018-02-14T12:01:07+01:00
CMS-11068 [back port to 11.2] Error in calendardate field in hippo
- add already translated labels

(cherry picked from commit d70ec7a43caee6eb239fd4db92965cc7c1b64b54)

- - - - -
cbd12dbd by Jeroen Hoffman at 2018-02-14T12:01:14+01:00
CMS-11068 [back port to 11.2] Click -- Klik, in Dutch

(cherry picked from commit 5681ee77dc4e5530364b620740509542c8bb6013)

- - - - -
bad6037e by Jeroen Hoffman at 2018-02-14T12:01:20+01:00
CMS-11068 [back port to 11.2] rename 
DateTimePrinter$JavaDateTimePrinter.properties to 
DatePrinter$JavaDatePrinter.properties

(cherry picked from commit 0b204e345dc8843bbdb7c0cfae523c7690e71537)

- - - - -
045befb8 by Jeroen Hoffman at 2018-02-14T12:02:13+01:00
CMS-11068 [back port to 11.2] add deprecated to YuiGMTDateField properties

(cherry picked from commit 9c4e9c5fed63dba4a92947b85a572b9304860604)

- - - - -


20 changed files:

- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter.registry.json
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter.registry.json
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_de.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_de.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_es.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_es.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_fr.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_fr.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_nl.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_nl.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_zh.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_zh.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.registry.json
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_de.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_es.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_fr.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_zh.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_de.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_es.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_fr.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_nl.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_zh.properties


Changes:

=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter.properties
=


=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter.registry.json
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter.registry.json
=


=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_de.properties
 → 
hippo-cms/resources/org/hippoecm

[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][master] 6 commits: CMS-11063 Error in calendardate field in hippo

[Jeroen Hoffman]

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


Commits:
94c94823 by Marijan Milicevic at 2018-02-06T12:32:33+01:00
CMS-11063 Error in calendardate field in hippo
- add date only tooltip and label

- - - - -
d70ec7a4 by Marijan Milicevic at 2018-02-06T14:17:09+01:00
CMS-11063 Error in calendardate field in hippo
- add already translated labels

- - - - -
5681ee77 by Jeroen Hoffman at 2018-02-06T14:25:16+01:00
CMS-11063 Click -- Klik, in Dutch

- - - - -
0b204e34 by Jeroen Hoffman at 2018-02-13T15:20:59+01:00
CMS-11063 rename DateTimePrinter$JavaDateTimePrinter.properties to 
DatePrinter$JavaDatePrinter.properties

- - - - -
9c4e9c5f by Jeroen Hoffman at 2018-02-13T15:27:17+01:00
CMS-11063 add deprecated to YuiGMTDateField properties

- - - - -
5f41e7ff by Jeroen Hoffman at 2018-02-13T15:46:14+01:00
CMS-11063 Reintegrate branch bugfix/CMS-11063 into master

- - - - -


20 changed files:

- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter.registry.json
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter.registry.json
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_de.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_de.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_es.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_es.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_fr.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_fr.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_nl.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_nl.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_zh.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_zh.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.registry.json
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_de.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_es.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_fr.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_zh.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_de.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_es.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_fr.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_nl.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_zh.properties


Changes:

=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter.properties
=


=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter.registry.json
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter.registry.json
=


=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_de.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_de.properties
=


=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_es.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins

[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-11063] CMS-11063 copyright 2018 for new file

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch bugfix/CMS-11063 at cms-community / hippo-cms


Commits:
bc0b0b7c by Jeroen Hoffman at 2018-02-13T15:41:10+01:00
CMS-11063 copyright 2018 for new file

- - - - -


1 changed file:

- 
test/src/test/java/org/hippoecm/frontend/plugins/standards/datetime/DatePrinterTest.java


Changes:

=
test/src/test/java/org/hippoecm/frontend/plugins/standards/datetime/DatePrinterTest.java
=
--- 
a/test/src/test/java/org/hippoecm/frontend/plugins/standards/datetime/DatePrinterTest.java
+++ 
b/test/src/test/java/org/hippoecm/frontend/plugins/standards/datetime/DatePrinterTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2016 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.



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/bc0b0b7c5b6a73606fd532b45646e83cc2c87f56
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-cms-translations][bugfix/CMS-11063] CMS-11063 add deprecated to YuiGMTDateField properties

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch bugfix/CMS-11063 at cms-community / 
hippo-cms-translations


Commits:
9c4e9c5f by Jeroen Hoffman at 2018-02-13T15:27:17+01:00
CMS-11063 add deprecated to YuiGMTDateField properties

- - - - -


6 changed files:

- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_de.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_es.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_fr.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_nl.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_zh.properties


Changes:

=
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.properties
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.properties
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.properties
@@ -1,3 +1,4 @@
+# deprecated: merged into YuiDateTimeField properties
 #Tue Jun 28 13:44:45 CEST 2016
 set-to-current-date-tooltip=Click to set current date
 set-to-current-date=Set to today


=
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_de.properties
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_de.properties
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_de.properties
@@ -1,3 +1,4 @@
+# deprecated: merged into YuiDateTimeField properties
 #Wed Oct 19 10:46:59 CEST 2016
 set-to-current-date-tooltip=Klicken, um aktuelles Datum einzustellen
 set-to-current-date=Auf Heute einstellen


=
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_es.properties
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_es.properties
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_es.properties
@@ -1,3 +1,4 @@
+# deprecated: merged into YuiDateTimeField properties
 #Wed Oct 19 10:47:23 CEST 2016
 set-to-current-date-tooltip=Haga clic para ajustar la fecha actual
 set-to-current-date=Fijado a hoy


=
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_fr.properties
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_fr.properties
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_fr.properties
@@ -1,3 +1,4 @@
+# deprecated: merged into YuiDateTimeField properties
 #Wed Oct 19 10:47:11 CEST 2016
 set-to-current-date-tooltip=Cliquez pour mettre date et heure actuelles
 set-to-current-date=R\u00E9gler pour aujourd'hui 


=
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_nl.properties
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_nl.properties
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_nl.properties
@@ -1,3 +1,4 @@
+# deprecated: merged into YuiDateTimeField properties
 #Wed Oct 19 10:46:12 CEST 2016
 set-to-current-date-tooltip=Click om de huidige datum te gebruiken
 set-to-current-date=Zet op vandaag


=
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_zh.properties
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_zh.properties
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField_zh.properties
@@ -1,3 +1,4 @@
+# deprecated, merged into YuiDateTimeField properties
 #Wed Oct 19 10:47:48 CEST 2016
 set-to-current-date-tooltip=\u70B9\u51FB\u8BBE\u7F6E\u5F53\u524D\u65E5\u671F
 set-to-current-date=\u8BBE\u7F6E\u4E3A\u4ECA\u5929



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-translations/commit/9c4e9c5fed63dba4a92947b85a572b9304860604
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-cms-translations][bugfix/CMS-11063] CMS-11063 rename DateTimePrinter$JavaDateTimePrinter.properties to…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch bugfix/CMS-11063 at cms-community / 
hippo-cms-translations


Commits:
0b204e34 by Jeroen Hoffman at 2018-02-13T15:20:59+01:00
CMS-11063 rename DateTimePrinter$JavaDateTimePrinter.properties to 
DatePrinter$JavaDatePrinter.properties

- - - - -


7 changed files:

- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter.registry.json
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter.registry.json
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_de.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_de.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_es.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_es.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_fr.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_fr.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_nl.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_nl.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_zh.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_zh.properties


Changes:

=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter.properties
=


=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter.registry.json
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter.registry.json
=


=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_de.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_de.properties
=


=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_es.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_es.properties
=


=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_fr.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_fr.properties
=


=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_nl.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_nl.properties
=


=
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter$JavaDateTimePrinter_zh.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/standards/datetime/DatePrinter$JavaDatePrinter_zh.properties
=



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-translations/commit/0b204e345dc8843bbdb7c0cfae523c7690e71537
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-cms-translations][bugfix/CMS-11063] CMS-11063 Click --> Klik, in Dutch

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch bugfix/CMS-11063 at cms-community / 
hippo-cms-translations


Commits:
5681ee77 by Jeroen Hoffman at 2018-02-06T14:25:16+01:00
CMS-11063 Click -- Klik, in Dutch

- - - - -


1 changed file:

- 
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties


Changes:

=
hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties
@@ -6,5 +6,5 @@ set-to-current-date-tooltip=Klik om de huidige datum en 
tijdstip in te stellen
 date-label=Datum
 picker-format=d-M-
 set-to-current-date=Huidige datum en tijd
-set-to-current-date-only-tooltip=Click om de huidige datum te gebruiken
+set-to-current-date-only-tooltip=Klik om de huidige datum te gebruiken
 set-to-current-date-only=Zet op vandaag



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-translations/commit/5681ee77dc4e5530364b620740509542c8bb6013
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-cms][bugfix/CMS-11063] CMS-11063 non-functional: (mostly) add @deprecated Javadoc

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch bugfix/CMS-11063 at cms-community / hippo-cms


Commits:
827f5dad by Jeroen Hoffman at 2018-02-06T10:39:34+01:00
CMS-11063 non-functional: (mostly) add @deprecated Javadoc

- - - - -


6 changed files:

- 
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/GMTDateLabel.java
- 
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
- 
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java
- 
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
- 
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.java
- 
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/DatePickerPlugin.java


Changes:

=
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/GMTDateLabel.java
=
--- 
a/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/GMTDateLabel.java
+++ 
b/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/GMTDateLabel.java
@@ -27,6 +27,9 @@ import org.apache.wicket.model.IModel;
 
 /**
  * Label component to render a date (year-month-day) of the {@link Date} 
object in GMT timezone.
+ *
+ * @deprecated no longer used because it uses a hardcoded GMT timezone, while 
user session time zone is to be used.
+ *  Use DateTimeLabel instead.
  */
 @Deprecated
 public class GMTDateLabel extends ZonedDateLabel {


=
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
=
--- 
a/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
+++ 
b/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
@@ -30,6 +30,8 @@ import org.apache.wicket.model.IModel;
 /**
  * Label component that represents only the date (year-month-day) of the
  * {@link ZonedDateTime} model object in current session locale format.
+ *
+ * @deprecated no longer used because it was only used by deprecated 
GMTDateLabel.
  */
 @Deprecated
 public class ZonedDateLabel extends Label {


=
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java
=
--- 
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java
+++ 
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-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.


=
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
=
--- 
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
+++ 
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
@@ -49,7 +49,6 @@ import java.util.TimeZone;
  *
  * @see YuiDatePickerSettings for all configuration options
  */
-
 public class YuiDateTimeField extends DateTimeField {
 
 public static final String DATE_LABEL = "date-label";
@@ -65,18 +64,20 @@ public class YuiDateTimeField extends DateTimeField {
 this(id, model, null);
 }
 
-public YuiDateTimeField(final String id, final IModel model, 
YuiDatePickerSettings settings) {
+public YuiDateTimeField(final String id, final IModel model, final 
YuiDatePickerSettings settings) {
 this(id, model, settings, false);
 }
 
-public YuiDateTimeField(final String id, final IModel model, 
YuiDatePickerSettings settings, final boolean hideTime) {
+public YuiDateTimeField(final String id, final IModel model, final 
YuiDatePickerSettings settings, final boolean hideTime) {
 super(id, model);
-this.hideTime = hideTime;
-if (settings == null) {
-settings = new YuiDatePickerSettings();
-settings.setLanguage(getLocale().getLanguage());
+
+if (settings != null) {
+this.settings = settings;
+}
+else {
+this.settings = new YuiDatePickerSettings();
+this.settings.setLanguage(getLocale().getLanguage());
 }
-this.settings = settings;
 
 setOutputMarkupId(true);
 
@@ -139,13 +140,14 @@ public class YuiDateTimeField extends DateTimeField {
 }
 });
 }
+
 if (hideTime) {
 // hiding the "hours" component hides the entire "hours" 
wicket:enclosure
 get(HOURS).setVisibilityAllowed(false);
 // hide the minutes field to prevent wicket.ajax javascript errors
  

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

[Jeroen Hoffman]

Jeroen Hoffman deleted branch bugfix/REPO-1912 at cms-community / 
hippo-repository

---

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][release/4.2] REPO-1927 [Back port to 11.2] SecurityManager doesn't sanitize userId in case of…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/4.2 at cms-community / hippo-repository


Commits:
981a89fa by Jeroen Hoffman at 2018-01-16T12:36:40+01:00
REPO-1927 [Back port to 11.2] SecurityManager doesnt sanitize userId in 
case of external providers to get memberships
- sanitize user id

- - - - -


1 changed file:

- engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java


Changes:

=
engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
=
--- a/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
+++ b/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-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.
@@ -362,10 +362,11 @@ public class SecurityManager implements 
HippoSecurityManager {
  */
 private Set getMemberships(String rawUserId, String providerId) {
 try {
+final String sanitizedUserId = sanitizeUserId(rawUserId, 
providerId);
 if (providers.containsKey(providerId)) {
-return 
providers.get(providerId).getGroupManager().getMembershipIds(rawUserId);
+return 
providers.get(providerId).getGroupManager().getMembershipIds(sanitizedUserId);
 } else {
-return 
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizeUserId(rawUserId,
 providerId));
+return 
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizedUserId);
 }
 } catch (RepositoryException e) {
 log.warn("Unable to get memberships for userId: " + rawUserId, e);



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/981a89fad7a30c81d4acba8f3ac4c19f260c97c1
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][release/5.0] REPO-1926 [Back port to 12.0] SecurityManager doesn't sanitize userId in case of…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/5.0 at cms-community / hippo-repository


Commits:
4cdd86d4 by Jeroen Hoffman at 2018-01-16T12:34:00+01:00
REPO-1926 [Back port to 12.0] SecurityManager doesnt sanitize userId in 
case of external providers to get memberships
- sanitize user id

- - - - -


1 changed file:

- engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java


Changes:

=
engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
=
--- a/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
+++ b/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-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.
@@ -362,10 +362,11 @@ public class SecurityManager implements 
HippoSecurityManager {
  */
 private Set getMemberships(String rawUserId, String providerId) {
 try {
+final String sanitizedUserId = sanitizeUserId(rawUserId, 
providerId);
 if (providers.containsKey(providerId)) {
-return 
providers.get(providerId).getGroupManager().getMembershipIds(rawUserId);
+return 
providers.get(providerId).getGroupManager().getMembershipIds(sanitizedUserId);
 } else {
-return 
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizeUserId(rawUserId,
 providerId));
+return 
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizedUserId);
 }
 } catch (RepositoryException e) {
 log.warn("Unable to get memberships for userId: " + rawUserId, e);



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/4cdd86d4e663a94e745c2459c7932c081f90348b
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][release/5.1] REPO-1925 [Back port to 12.1] SecurityManager doesn't sanitize userId in case of…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/5.1 at cms-community / hippo-repository


Commits:
b3560a0b by Jeroen Hoffman at 2018-01-16T12:29:20+01:00
REPO-1925 [Back port to 12.1] SecurityManager doesnt sanitize userId in 
case of external providers to get memberships
- sanitize user id

- - - - -


1 changed file:

- engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java


Changes:

=
engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
=
--- a/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
+++ b/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-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.
@@ -362,10 +362,11 @@ public class SecurityManager implements 
HippoSecurityManager {
  */
 private Set getMemberships(String rawUserId, String providerId) {
 try {
+final String sanitizedUserId = sanitizeUserId(rawUserId, 
providerId);
 if (providers.containsKey(providerId)) {
-return 
providers.get(providerId).getGroupManager().getMembershipIds(rawUserId);
+return 
providers.get(providerId).getGroupManager().getMembershipIds(sanitizedUserId);
 } else {
-return 
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizeUserId(rawUserId,
 providerId));
+return 
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizedUserId);
 }
 } catch (RepositoryException e) {
 log.warn("Unable to get memberships for userId: " + rawUserId, e);



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/b3560a0be1f02acb21cca463055f62e2dfeaa751
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][master] 3 commits: REPO-1912 SecurityManager doesn't sanitize userId in case of external providers to get memberships

[Jeroen Hoffman]

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


Commits:
df32033d by Marijan Milicevic at 2018-01-11T11:16:19+01:00
REPO-1912 SecurityManager doesnt sanitize userId in case of external 
providers to get memberships
- sanitize user id

- - - - -
48a7f040 by Jeroen Hoffman at 2018-01-16T12:05:31+01:00
REPO-1912 Merge branch master into bugfix/REPO-1912

- - - - -
260a816a by Jeroen Hoffman at 2018-01-16T12:16:09+01:00
REPO-1912 Reintegrate branch bugfix/REPO-1912 into master

- - - - -


1 changed file:

- engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java


Changes:

=
engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
=
--- a/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
+++ b/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-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.
@@ -362,10 +362,11 @@ public class SecurityManager implements 
HippoSecurityManager {
  */
 private Set getMemberships(String rawUserId, String providerId) {
 try {
+final String sanitizedUserId = sanitizeUserId(rawUserId, 
providerId);
 if (providers.containsKey(providerId)) {
-return 
providers.get(providerId).getGroupManager().getMembershipIds(rawUserId);
+return 
providers.get(providerId).getGroupManager().getMembershipIds(sanitizedUserId);
 } else {
-return 
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizeUserId(rawUserId,
 providerId));
+return 
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizedUserId);
 }
 } catch (RepositoryException e) {
 log.warn("Unable to get memberships for userId: " + rawUserId, e);



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/compare/2d82cbed0bb9b923d38c2e3538e069fc3959aa14...260a816ae0c1b75209c5719546de2cfd2b51781b

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/compare/2d82cbed0bb9b923d38c2e3538e069fc3959aa14...260a816ae0c1b75209c5719546de2cfd2b51781b
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-cms] Deleted branch feature/CMS-10015

[Jeroen Hoffman]

Jeroen Hoffman deleted branch feature/CMS-10015 at cms-community / hippo-cms

---

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-cms][master] 9 commits: CMS-10015 made update editor left column resizable

[Jeroen Hoffman]

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


Commits:
cccd9a62 by Jasper Floor at 2017-09-22T14:33:11+02:00
CMS-10015 made update editor left column resizable

- - - - -
47a7417c by Jasper Floor at 2017-10-04T14:41:25+02:00
CMS-10015 Merge master changes in feature/CMS-10015

- - - - -
363894bd by Bert Leunis at 2017-10-09T15:18:20+02:00
CMS-10015 make the whole left column resizable

- - - - -
fd0a962f by Bert Leunis at 2017-10-16T11:41:42+02:00
CMS-10015 no height calc necessary for tree; no grow on button

- - - - -
4604053e by Bert Leunis at 2017-11-21T10:48:40+01:00
CMS-10015 Merge master changes in feature/CMS-10015

- - - - -
494da7f5 by Bert Leunis at 2017-11-21T12:00:25+01:00
CMS-10015 Hide vertical scroll bar in Edge

- - - - -
30c9e942 by Jeroen Hoffman at 2018-01-09T13:37:27+01:00
CMS-10015 Merge branch master into feature/CMS-10015

- - - - -
d6d55253 by Jeroen Hoffman at 2018-01-16T10:52:54+01:00
CMS-10015 Merge branch master into feature/CMS-10015

- - - - -
0dc9102c by Jeroen Hoffman at 2018-01-16T10:52:57+01:00
CMS-10015 Reintegrate branch feature/CMS-10015 into master

- - - - -


2 changed files:

- api/src/main/styling/styles/_admin-perspective.scss
- 
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/updater/UpdaterPanel.html


Changes:

=
api/src/main/styling/styles/_admin-perspective.scss
=
--- a/api/src/main/styling/styles/_admin-perspective.scss
+++ b/api/src/main/styling/styles/_admin-perspective.scss
@@ -270,33 +270,50 @@
   height: 100%;
   width: 100%;
   display: flex;
-  flex-flow: column;
+  flex-flow: row;
   overflow: hidden;
 
   > * {
 display: flex;
+flex-flow: column;
   }
 
   .updater-left {
-min-width: 200px;
-max-width: 200px;
 border-right: 1px solid $dark-gray;
+overflow: auto;
+resize: horizontal;
+width: 200px;
+
+.updater-tree {
+  border-top: 1px solid $dark-gray;
+
+  padding: 4px 0 0 0;
+  flex: 0;
+
+  > div.hippo-tree > div.wicket-tree {
+.row {
+  padding-left: 5px;
+}
+.row-selected {
+  background: $primary;
+}
+  }
+}
   }
 
-  .updater-editor-top > .updater-left {
+  .updater-left-top {
 display: flex;
 justify-content: center;
 align-items: center;
-
-border-bottom: 1px solid $dark-gray;
+flex: 0 0 auto;
 
 > input {
   flex: 1 1 auto;
-  margin: 0 8px;
+  margin: 6px 8px;
 }
   }
 
-  .updater-editor-top-right {
+  .updater-right-top {
 padding: 8px;
 
 h2 {
@@ -304,25 +321,12 @@
 }
   }
 
-  > .updater-editor-main {
-height: calc(100% - 32px);
-
-.updater-tree {
-  overflow: auto;
-  border-right: 1px solid $dark-gray;
-  padding: 4px 0 0 0;
-
-  > div.hippo-tree > div.wicket-tree {
-.row {
-  padding-left: 5px;
-}
-.row-selected {
-  background: $primary;
-}
-  }
-}
-
+  > .updater-right {
+width: 100%;
+
 .updater-details {
+  height: calc(100% - 32px);
+
   display: flex;
   overflow-y: auto;
 


=
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/updater/UpdaterPanel.html
=
--- 
a/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/updater/UpdaterPanel.html
+++ 
b/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/updater/UpdaterPanel.html
@@ -1,7 +1,7 @@
 
 

[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10015] 32 commits: CMS-11002 Fix obvious NPE possibility

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/CMS-10015 at cms-community / hippo-cms


Commits:
f5ae5cf2 by Ard Schrijvers at 2017-11-29T10:18:58+01:00
CMS-11002 Fix obvious NPE possibility

- - - - -
7110516f by Arent-Jan Banck at 2017-11-29T12:18:58+01:00
CMS-11005 Use CKEDitor 4.7.1-h12.1.0

- - - - -
55debee2 by Ate Douma at 2017-11-29T15:43:14+01:00
CMS-10813 Fix non-serializable problem with ConfigurationService instance

- - - - -
f85c6dab by Arent-Jan Banck at 2017-12-07T23:29:09+01:00
CMS-11019 Remove println statement and remove xerces from the performance test

- - - - -
22da7e3b by Arent-Jan Banck at 2017-12-07T23:34:15+01:00
CMS-11019 Remove testPerformance. It was never executed as the html was invalid 
and the dom parser throws an exception that is silently swallowed, test still 
passed successful. Even when fixed its not testing anything relevent, only 
that Dom parsing is slower than directly using a string.

- - - - -
9e3db9cb by Bert Leunis at 2017-12-12T13:47:24+01:00
CMS-10864 restyling of search field in users panel

- - - - -
99fc343b by Bert Leunis at 2017-12-12T16:09:28+01:00
CMS-10864 toggle icon and search term

- - - - -
eb207493 by Bert Leunis at 2017-12-14T10:56:22+01:00
CMS-10864 make SubmittingTextField accessible for other plugins

- - - - -
d29d14bc by Bert Leunis at 2017-12-14T10:56:59+01:00
CMS-10864 search can be done by enter or spy glass

- - - - -
cd6c5243 by Bert Leunis at 2017-12-14T13:10:32+01:00
CMS-10864 new SearchTermPanel, used in ListGroupsPanel

- - - - -
17d9560a by Bert Leunis at 2017-12-14T13:50:53+01:00
CMS-10864 use search term panel in user list and set members panels

- - - - -
c0d60d53 by Bert Leunis at 2017-12-14T14:21:47+01:00
CMS-10864 remove spacing between table rows in set group members panel

- - - - -
62cc9014 by Bert Leunis at 2017-12-14T14:26:19+01:00
CMS-10864 remove obsolete properties

- - - - -
573bf679 by Bert Leunis at 2017-12-14T14:50:33+01:00
CMS-10864 improve generics

- - - - -
efb97fc0 by Bert Leunis at 2017-12-14T16:55:32+01:00
CMS-10862 results for user or group name case insensitive

- - - - -
bffdd96a by Bert Leunis at 2017-12-15T10:07:59+01:00
CMS-10864 clear search term when moving up in the bread crumb path

- - - - -
39154935 by Bert Leunis at 2017-12-15T14:54:52+01:00
CMS-10864 improve userlist sorting

- - - - -
3acd248d by Bert Leunis at 2017-12-15T15:05:47+01:00
CMS-10864 improve group list sorting

- - - - -
f62598dc by Bert Leunis at 2017-12-15T15:29:26+01:00
CMS-10864 revert improve group list sorting

This reverts commit 3acd248dbe93c9919956b7c74934fce283540599.

- - - - -
43deeab2 by Bert Leunis at 2017-12-15T15:31:36+01:00
CMS-10864 revert improve userlist sorting

This reverts commit 39154935f323c2b5491cc8740b460e7573c60aed.

- - - - -
0872cc50 by Bert Leunis at 2017-12-15T15:40:34+01:00
CMS-10862 improve sorting of user and group list

- - - - -
5a6d3890 by Bert Leunis at 2017-12-18T14:14:00+01:00
CMS-10864 use css variable name. use ReadOnlyModel.

- - - - -
54a06f1e by Bert Leunis at 2017-12-18T14:17:32+01:00
CMS-10864 Reintegrate feature/CMS-10864

- - - - -
6b2776ad by Bert Leunis at 2017-12-18T15:42:49+01:00
CMS-10862 Merge master changes in feature/CMS-10862

- - - - -
efaf23ee by Bert Leunis at 2017-12-22T13:31:51+01:00
CMS-10862 use search builder for content also for users and groups

- - - - -
4e227d43 by Bert Leunis at 2017-12-22T16:39:49+01:00
CMS-10862 small improvements after review. move unit tests to correct classes.

- - - - -
f57b181e by Bert Leunis at 2017-12-22T16:43:18+01:00
CMS-10862 Reintegrate feature/CMS-10862

- - - - -
0dd26c17 by Sergey Shepelevich at 2018-01-12T11:30:16+01:00
CMS-11037 Improvement on validation of svg images

- - - - -
7532232a by Sergey Shepelevich at 2018-01-12T11:53:33+01:00
CMS-11037 Improvement of validation message

- - - - -
698949d2 by Sergey Shepelevich at 2018-01-12T14:51:45+01:00
CMS-16 License header fix

- - - - -
72f67873 by Sergey Shepelevich at 2018-01-15T11:00:03+01:00
CMS-11037 Case insensitive substring search

- - - - -
72124a37 by Jeroen Hoffman at 2018-01-15T16:54:16+01:00
CMS-10015 Merge branch master into feature/CMS-10015

- - - - -


30 changed files:

- + 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/model/SvgScriptGalleryException.java
- 
api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/JQueryFileUploadDialog.properties
- + 
api/src/main/java/org/hippoecm/frontend/plugins/standards/search/GeneralSearchBuilder.java
- 
api/src/main/java/org/hippoecm/frontend/plugins/standards/search/QueryResultModel.java
- 
api/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java
- api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin.java
- api/src/main/styling/styles/_admin-perspective.scss
- brokenlinks/repository/pom.xml
- 
brokenlinks/repository/src/test/java/org/onehippo/cms7/brokenlinks/ParseTextsTest.java
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins

[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10015] 7 commits: CMS-10937 Update parent project to version 29.3

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/CMS-10015 at cms-community / hippo-cms


Commits:
0a0a44f0 by Arent-Jan Banck at 2017-11-27T13:54:14+01:00
CMS-10937 Update parent project to version 29.3

- - - - -
8b9f6dd7 by Peter Centgraf at 2017-11-27T16:38:37+01:00
CMS-10813 Show category and origin in Console according to HCM

- - - - -
1b4555f1 by Peter Centgraf at 2017-11-27T16:38:49+01:00
CMS-10997 apply icons and styling in console for /hcm:hcm, /jcr:system, 
/hippo:log, and /hippo:reports

- - - - -
1ef87646 by Ard Schrijvers at 2017-11-27T23:10:22+01:00
CMS-10953 Revert CMS-10953 Initialize context payload in constructor

This reverts commit 44bd816d5bfc8ac8d143722879405933ade8156a.

- - - - -
97fa2831 by Ard Schrijvers at 2017-11-27T23:10:55+01:00
CMS-10910 Revert CMS-10910 Implement CmsSessionContext attribute 
management methods

This reverts commit 90fb6de879cf0329ac6ee736b9d2cf7c27ee27a9.

- - - - -
585d25ec by Arent-Jan Banck at 2017-11-28T14:46:07+01:00
CMS-11000 Bump versions to prepare 12.2 development iteration

- - - - -
30c9e942 by Jeroen Hoffman at 2018-01-09T13:37:27+01:00
CMS-10015 Merge branch master into feature/CMS-10015

- - - - -


30 changed files:

- api/pom.xml
- automatic-export/frontend/pom.xml
- automatic-export/pom.xml
- automatic-export/repository/pom.xml
- brokenlinks/common/pom.xml
- brokenlinks/frontend/pom.xml
- brokenlinks/pom.xml
- brokenlinks/repository/pom.xml
- brokenlinks/test/pom.xml
- builtin/pom.xml
- config/pom.xml
- console/frontend/pom.xml
- + 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/behavior/OriginTitleBehavior.java
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/NodeEditor.java
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/FontAwesomeIcon.java
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/JcrNodeIcon.java
- 
console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/console.css
- 
console/frontend/src/test/java/org/hippoecm/frontend/plugins/console/browser/JcrNodeIconTest.java
- console/pom.xml
- console/repository/pom.xml
- dependencies/pom.xml
- editor/common/pom.xml
- editor/frontend/pom.xml
- editor/pom.xml
- editor/repository/pom.xml
- editor/test/pom.xml
- engine/pom.xml
- 
engine/src/main/java/org/onehippo/cms7/services/cmscontext/CmsContextServiceImpl.java


The diff was not included because it is too large.


View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/494da7f57d01e7f2c2ff38e798e18568221aa26b...30c9e942d1d6dcf7530d101f31fac8cf1c2f3adc

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/494da7f57d01e7f2c2ff38e798e18568221aa26b...30c9e942d1d6dcf7530d101f31fac8cf1c2f3adc
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-plugin-robotstxt] Deleted branch bugfix/HIPPLUG-1488

[Jeroen Hoffman]

Jeroen Hoffman deleted branch bugfix/HIPPLUG-1488 at cms-community / 
hippo-plugin-robotstxt

---

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] Deleted branch feature/ESSENTIALS-1106

[Jeroen Hoffman]

Jeroen Hoffman deleted branch feature/ESSENTIALS-1106 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] 6 commits: ESSENTIALS-1106 disbale behavior and remove suggestion

[Jeroen Hoffman]

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


Commits:
996cb58d by Jasper Floor at 2017-11-27T16:41:53+01:00
ESSENTIALS-1106 disbale behavior and remove suggestion

- - - - -
57b6dfc7 by Jasper Floor at 2017-11-27T16:42:50+01:00
ESSENTIALS-1106 copyright

- - - - -
c49fb4fb by Jasper Floor at 2017-11-27T16:52:41+01:00
ESSENTIALS-1106 disable input in not checked

- - - - -
0b5d4f6b by Jeroen Hoffman at 2018-01-08T10:20:36+01:00
ESSENTIALS-1106 Merge branch master into feature/ESSENTIALS-1106

- - - - -
c50e92e0 by Jeroen Hoffman at 2018-01-08T11:51:08+01:00
ESSENTIALS-1106 put back the placeholder=10, but with always required. Also add 
reg exp pattern so there must be a 1 or 2 digit value.

- - - - -
40190f3e by Jeroen Hoffman at 2018-01-08T11:58:26+01:00
ESSENTIALS-1106 Reintegrate branch feature/ESSENTIALS-1106 into master

- - - - -


1 changed file:

- 
plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html


Changes:

=
plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html
=
--- 
a/plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html
+++ 
b/plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html
@@ -1,5 +1,5 @@
 

[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1106] 36 commits: ESSENTIALS-1119 Add "built-in" instruction for adding mvn dependency

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/ESSENTIALS-1106 at cms-community / 
hippo-essentials


Commits:
80aef3cf by Tobias Jeger at 2017-11-27T16:27:50+01:00
ESSENTIALS-1119 Add built-in instruction for adding mvn dependency

- use this instruction rather than custom instruction classes
- fix the casing of the hst-bean-classes built-in instruction
- make the SDK utilities more robust against missing files or data
- remove now-superfluous ParameterService classes
- remove unused class FrontendPluginBuilder

- - - - -
1cd8ad39 by Tobias Jeger at 2017-11-27T16:27:51+01:00
ESSENTIALS-1119 Refactor SEO plugin to use mavenDependency instruction

Doing so removes the need to rebuild twice when installing this feature.

- - - - -
6c7185e2 by Tobias Jeger at 2017-11-27T16:27:51+01:00
ESSENTIALS-1119 Refactor some plugins to use mavenDependency instructions

- - - - -
c60cc40e by Tobias Jeger at 2017-11-27T17:08:59+01:00
ESSENTIALS-1119 Refactor BR plugins to use mavenDependency instructions

this shaves off the need for a few rebuilds.

- - - - -
625a6bea by Arent-Jan Banck at 2017-11-28T15:22:24+01:00
ESSENTIALS-1126 prepare the 12.2 development iteration

- - - - -
0bfc2861 by Tobias Jeger at 2017-11-29T09:55:00+01:00
ESSENTIALS-1119 Reintegrate feature/ESSENTIALS-1119-rebased

- - - - -
cb9ef7f6 by Tobias Jeger at 2017-11-29T14:39:27+01:00
ESSENTIALS-1127 Refactor the change message compilation to remove Guava 
dependency of API

- - - - -
e703163a by Tobias Jeger at 2017-11-29T14:41:08+01:00
ESSENTIALS-1127 Refactor WebXmlUtils into WebXmlService

Get rid of unused plugin dependencies on SDK-implementation.

- - - - -
2e51cb03 by Tobias Jeger at 2017-11-29T14:41:29+01:00
ESSENTIALS-1127 Refactor Log4j2Utils to become an injectable service.

- - - - -
1f3e56df by Tobias Jeger at 2017-11-30T14:53:15+01:00
ESSENTIALS-1127 Refactor ContextXmlUtils to become an injectable service

Also extract some common usage patterns for updating XML files in order
to reduce code duplication.

- - - - -
0bbb2278 by Tobias Jeger at 2017-12-01T09:17:24+01:00
ESSENTIALS-1127 Refactor MavenAssemblyUtils to become an injectable service

- - - - -
38bac71b by Tobias Jeger at 2017-12-01T12:09:09+01:00
ESSENTIALS-1127 Refactor MavenCargoUtils to become an injectable service

- - - - -
3f0c8f3a by Tobias Jeger at 2017-12-03T13:26:06+01:00
ESSENTIALS-1127 Mark plugin pom to discourage depending on implementation

- - - - -
019251c1 by Arent-Jan Banck at 2017-12-04T14:14:58+01:00
ESSENTIALS-1130 Update Essentials to use the Jackson2 classes

- - - - -
dd6b50c6 by Tobias Jeger at 2017-12-05T10:43:01+01:00
ESSENTIALS-1127 Fix return value of URL rewriter install instruction

- - - - -
a55356b4 by Tobias Jeger at 2017-12-05T12:06:16+01:00
ESSENTIALS-1127 Reduce API overhead for simple data class MavenDependency

- - - - -
8196fb62 by Tobias Jeger at 2017-12-05T12:06:44+01:00
ESSENTIALS-1127 Reintegrate feature/ESSENTIALS-1127

- - - - -
0c036794 by Tobias Jeger at 2017-12-05T12:07:42+01:00
ESSENTIALS-1132 Get rid of PluginParameterService

- - - - -
3a3028b8 by Arent-Jan Banck at 2017-12-06T19:30:33+01:00
ESSENTIALS-1134 Use request.getScheme() instead of hardcoded http://

- - - - -
f424828c by Tobias Jeger at 2017-12-07T21:17:04+01:00
ESSENTIALS-1132 Remove superfluous @type JSON props from descriptors

- - - - -
a197c800 by Tobias Jeger at 2017-12-07T23:43:59+01:00
ESSENTIALS-1132 Remove remaining @type JSON props from descriptors

- Replace bean+interface construction for maven dependencies with a simple
plain bean hierarchy in the API.
- Extract dependency utils into MavenDependencyService

- - - - -
a186a2db by Tobias Jeger at 2017-12-08T10:30:58+01:00
ESSENTIALS-1132 Trivial refactoring to improve ordering of attributes

- - - - -
7401a3cc by Tobias Jeger at 2017-12-08T22:31:58+01:00
ESSENTIALS-1132 Create MavenRepositoryService

- Migrate repository-related functionality from MavenDependencyUtils to
implementation of new service
- Replace interface+class construct for Repository bean with simple data
bean MavenRepository in API module

- - - - -
5ff37f50 by Tobias Jeger at 2017-12-08T23:06:38+01:00
ESSENTIALS-1132 Rename DependencyUtils to EnterpriseUtils

- - - - -
f59e21a5 by Tobias Jeger at 2017-12-10T10:04:47+01:00
ESSENTIALS-1132 Refactor Vendor to simple data bean

rather than defining an interface + implementation.

- - - - -
624684b7 by Tobias Jeger at 2017-12-11T15:51:23+01:00
ESSENTIALS-1132 Delete PluginDescriptor interface to promote data bean

- - - - -
19bfe701 by Tobias Jeger at 2017-12-11T15:53:14+01:00
ESSENTIALS-1132 Move PluginDescriptorRestful (impl) to PluginDescriptor (api)

- - - - -
12539fc8 by Tobias Jeger at 2017-12-11T22:01:41+01:00
ESSENTIALS-1132 Fix EnterpriseUtils to avoid duplicate dependencies

- - - - -
d456134d by Tobias Jeger at 2017-12-11T22:04:28+01:00
ESSENTIALS-1132 Refactor PluginDescriptorRestful into PluginDescriptor

- without dependencies on the SDK implementation module

[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10840] 6 commits: CMS-10813 Show category and origin in Console according to HCM

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/CMS-10840 at cms-community / hippo-cms


Commits:
8b9f6dd7 by Peter Centgraf at 2017-11-27T16:38:37+01:00
CMS-10813 Show category and origin in Console according to HCM

- - - - -
1b4555f1 by Peter Centgraf at 2017-11-27T16:38:49+01:00
CMS-10997 apply icons and styling in console for /hcm:hcm, /jcr:system, 
/hippo:log, and /hippo:reports

- - - - -
1ef87646 by Ard Schrijvers at 2017-11-27T23:10:22+01:00
CMS-10953 Revert CMS-10953 Initialize context payload in constructor

This reverts commit 44bd816d5bfc8ac8d143722879405933ade8156a.

- - - - -
97fa2831 by Ard Schrijvers at 2017-11-27T23:10:55+01:00
CMS-10910 Revert CMS-10910 Implement CmsSessionContext attribute 
management methods

This reverts commit 90fb6de879cf0329ac6ee736b9d2cf7c27ee27a9.

- - - - -
585d25ec by Arent-Jan Banck at 2017-11-28T14:46:07+01:00
CMS-11000 Bump versions to prepare 12.2 development iteration

- - - - -
4679ac04 by Jeroen Hoffman at 2017-11-29T10:34:48+01:00
CMS-10840 Merge branch master into feature/CMS-10840

- - - - -


30 changed files:

- api/pom.xml
- automatic-export/frontend/pom.xml
- automatic-export/pom.xml
- automatic-export/repository/pom.xml
- brokenlinks/common/pom.xml
- brokenlinks/frontend/pom.xml
- brokenlinks/pom.xml
- brokenlinks/repository/pom.xml
- brokenlinks/test/pom.xml
- builtin/pom.xml
- config/pom.xml
- console/frontend/pom.xml
- + 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/behavior/OriginTitleBehavior.java
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/NodeEditor.java
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/FontAwesomeIcon.java
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/JcrNodeIcon.java
- 
console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/console.css
- 
console/frontend/src/test/java/org/hippoecm/frontend/plugins/console/browser/JcrNodeIconTest.java
- console/pom.xml
- console/repository/pom.xml
- dependencies/pom.xml
- editor/common/pom.xml
- editor/frontend/pom.xml
- editor/pom.xml
- editor/repository/pom.xml
- editor/test/pom.xml
- engine/pom.xml
- 
engine/src/main/java/org/onehippo/cms7/services/cmscontext/CmsContextServiceImpl.java


The diff was not included because it is too large.


View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/af13829fcc96927e91b47fbda9b08c29beb342f8...4679ac045e7d3241c4b76dc5096c925ce2a3b386

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/af13829fcc96927e91b47fbda9b08c29beb342f8...4679ac045e7d3241c4b76dc5096c925ce2a3b386
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-plugin-robotstxt] Deleted branch feature/pre-hcm

[Jeroen Hoffman]

Jeroen Hoffman deleted branch feature/pre-hcm at cms-community / 
hippo-plugin-robotstxt

---

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-plugin-taxonomy] Deleted branch feature/HIPPLUG-1495

[Jeroen Hoffman]

Jeroen Hoffman deleted branch feature/HIPPLUG-1495 at cms-community / 
hippo-plugin-taxonomy

---

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-plugin-taxonomy][feature/HIPPLUG-1495] 11 commits: HIPPLUG-1487 introduce locale with also a region code

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/HIPPLUG-1495 at cms-community / 
hippo-plugin-taxonomy


Commits:
2aab8669 by Bert Leunis at 2017-10-05T15:26:17+02:00
HIPPLUG-1487 introduce locale with also a region code

- - - - -
8038802b by Bert Leunis at 2017-10-06T16:13:39+02:00
HIPPLUG-1487 to have a big tree in the demo is a good thing

- - - - -
b1773ef1 by Tobias Jeger at 2017-10-11T15:47:02+02:00
HIPPLUG-1497 Fix bootstrap warnings

(cherry picked from commit 94125ea358684bc22084aeb6d74490a4261f5b97)

- - - - -
2c7e90ab by Tobias Jeger at 2017-10-30T14:45:43+01:00
HIPPLUG-1502 Move content categorization from demo to plugin

- - - - -
6fb6346d by Tobias Jeger at 2017-10-30T14:55:30+01:00
HIPPLUG-1502 Fix auto-export setup in demo project

- - - - -
a2e0cfcb by Jeroen Hoffman at 2017-11-20T11:28:13+01:00
HIPPLUG-1487 Merge branch master into feature/HIPPLUG-1487

# Conflicts:
#   demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml

- - - - -
06ea3091 by Jeroen Hoffman at 2017-11-20T11:44:51+01:00
HIPPLUG-1487 bump referenced to demo parent to 4.1.0-SNAPSHOT

- - - - -
abcf0d27 by Jeroen Hoffman at 2017-11-20T12:06:47+01:00
HIPPLUG-1487 rename channels from Selection Demo to Taxonomy Demo

- - - - -
a4668705 by Jeroen Hoffman at 2017-11-20T12:11:54+01:00
HIPPLUG-1487 Reintegrate branch feature/HIPPLUG-1487 into master

- - - - -
55b31bfd by Jeroen Hoffman at 2017-11-20T12:18:33+01:00
HIPPLUG-1495 Merge branch master into feature/HIPPLUG-1495

- - - - -
bb1e885c by Jeroen Hoffman at 2017-11-21T09:23:16+01:00
HIPPLUG-1495 Remove space between details labels and colon because it made the 
colon wrap to next line in case of larger texts

- - - - -


30 changed files:

- 
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyBrowser$Details.html
- addon/frontend/src/main/resources/org/onehippo/taxonomy/plugin/style.css
- addon/repository/src/main/resources/hcm-config/main.yaml
- demo/cms/pom.xml
- demo/plugin/pom.xml
- demo/plugin/src/main/resources/hcm-config/main.yaml
- demo/pom.xml
- demo/repository-data/pom.xml
- demo/repository-data/src/main/resources/hcm-config/hst-configurations.yaml
- demo/repository-data/src/main/resources/hcm-config/hst-sites.yaml
- demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml
- 
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-fr/channel.yaml
 → 
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en-gb/channel.yaml
- 
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-fr/sitemap.yaml
 → 
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en-gb/sitemap.yaml
- 
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-fr/sitemenus.yaml
 → 
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en-gb/sitemenus.yaml
- 
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en/channel.yaml
- 
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-nl/channel.yaml
- demo/repository-data/src/main/resources/hcm-config/localeproviderservice.yaml
- demo/repository-data/src/main/resources/hcm-config/main.yaml
- demo/repository-data/src/main/resources/hcm-content/taxonomies.yaml
- + 
demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-common-en-gb.yaml
- 
demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-common-en.yaml
- − 
demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-common-fr.yaml
- 
demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-common-nl.yaml
- + 
demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-root-en-gb.yaml
- demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-root-en.yaml
- − 
demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-root-fr.yaml
- demo/repository-data/src/main/resources/hcm-content/taxonomy-demo-root-nl.yaml
- demo/site/pom.xml
- 
demo/site/src/main/java/org/onehippo/taxonomy/demo/components/TaxonomyCategoryResult.java
- + 
demo/site/src/main/java/org/onehippo/taxonomy/demo/components/TaxonomyCategoryResultInfo.java


The diff was not included because it is too large.


View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/220ddb65ef94949e153426d75c4f8ca2209e22e5...bb1e885cc3ddad310dfefbf5927e16dd85726a3b

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/220ddb65ef94949e153426d75c4f8ca2209e22e5...bb1e885cc3ddad310dfefbf5927e16dd85726a3b
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-plugin-taxonomy] Deleted branch feature/HIPPLUG-1487

[Jeroen Hoffman]

Jeroen Hoffman deleted branch feature/HIPPLUG-1487 at cms-community / 
hippo-plugin-taxonomy

---

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-plugin-taxonomy][feature/HIPPLUG-1487] HIPPLUG-1487 rename channels from Selection Demo to Taxonomy Demo

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/HIPPLUG-1487 at cms-community / 
hippo-plugin-taxonomy


Commits:
abcf0d27 by Jeroen Hoffman at 2017-11-20T12:06:47+01:00
HIPPLUG-1487 rename channels from Selection Demo to Taxonomy Demo

- - - - -


3 changed files:

- 
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en-gb/channel.yaml
- 
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en/channel.yaml
- 
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-nl/channel.yaml


Changes:

=
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en-gb/channel.yaml
=
--- 
a/demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en-gb/channel.yaml
+++ 
b/demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en-gb/channel.yaml
@@ -3,7 +3,7 @@ definitions:
 /hst:hst/hst:configurations/taxonomydemo-en-gb/hst:channel:
   jcr:primaryType: hst:channel
   hst:channelinfoclass: org.onehippo.taxonomy.demo.channels.WebsiteInfo
-  hst:name: Selection Demo UK
+  hst:name: Taxonomy Demo UK
   hst:type: website
   /hst:channelinfo:
 jcr:primaryType: hst:channelinfo


=
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en/channel.yaml
=
--- 
a/demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en/channel.yaml
+++ 
b/demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-en/channel.yaml
@@ -3,7 +3,7 @@ definitions:
 /hst:hst/hst:configurations/taxonomydemo-en/hst:channel:
   jcr:primaryType: hst:channel
   hst:channelinfoclass: org.onehippo.taxonomy.demo.channels.WebsiteInfo
-  hst:name: Selection Demo EN
+  hst:name: Taxonomy Demo EN
   hst:type: website
   /hst:channelinfo:
 jcr:primaryType: hst:channelinfo


=
demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-nl/channel.yaml
=
--- 
a/demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-nl/channel.yaml
+++ 
b/demo/repository-data/src/main/resources/hcm-config/hstconfiguration/taxonomydemo-nl/channel.yaml
@@ -3,7 +3,7 @@ definitions:
 /hst:hst/hst:configurations/taxonomydemo-nl/hst:channel:
   jcr:primaryType: hst:channel
   hst:channelinfoclass: org.onehippo.taxonomy.demo.channels.WebsiteInfo
-  hst:name: Selection Demo NL
+  hst:name: Taxonomy Demo NL
   hst:type: website
   /hst:channelinfo:
 jcr:primaryType: hst:channelinfo



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/abcf0d2784b291bc2ae004b1430c0c3806d7f4ab

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/abcf0d2784b291bc2ae004b1430c0c3806d7f4ab
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-plugin-taxonomy][feature/HIPPLUG-1487] HIPPLUG-1487 bump referenced to demo parent to 4.1.0-SNAPSHOT

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/HIPPLUG-1487 at cms-community / 
hippo-plugin-taxonomy


Commits:
06ea3091 by Jeroen Hoffman at 2017-11-20T11:44:51+01:00
HIPPLUG-1487 bump referenced to demo parent to 4.1.0-SNAPSHOT

- - - - -


4 changed files:

- demo/cms/pom.xml
- demo/plugin/pom.xml
- demo/repository-data/pom.xml
- demo/site/pom.xml


Changes:

=
demo/cms/pom.xml
=
--- a/demo/cms/pom.xml
+++ b/demo/cms/pom.xml
@@ -20,7 +20,7 @@
   
 org.onehippo.cms7
 hippo-plugin-taxonomy-demo
-4.0.0-SNAPSHOT
+4.1.0-SNAPSHOT
   
 
   Hippo Plugin Taxonomy Demo CMS


=
demo/plugin/pom.xml
=
--- a/demo/plugin/pom.xml
+++ b/demo/plugin/pom.xml
@@ -20,7 +20,7 @@
   
 org.onehippo.cms7
 hippo-plugin-taxonomy-demo
-4.0.0-SNAPSHOT
+4.1.0-SNAPSHOT
   
 
   Hippo Plugin Taxonomy Demo Plugin


=
demo/repository-data/pom.xml
=
--- a/demo/repository-data/pom.xml
+++ b/demo/repository-data/pom.xml
@@ -19,7 +19,7 @@
   
 org.onehippo.cms7
 hippo-plugin-taxonomy-demo
-4.0.0-SNAPSHOT
+4.1.0-SNAPSHOT
   
 
   Hippo Plugin Taxonomy Demo Repository Data


=
demo/site/pom.xml
=
--- a/demo/site/pom.xml
+++ b/demo/site/pom.xml
@@ -20,7 +20,7 @@
   
 org.onehippo.cms7
 hippo-plugin-taxonomy-demo
-4.0.0-SNAPSHOT
+4.1.0-SNAPSHOT
   
 
   Hippo Plugin Taxonomy Demo Site



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/06ea3091c60e15ddacbb7e8b3ff19a0ba4c2a0fa

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/06ea3091c60e15ddacbb7e8b3ff19a0ba4c2a0fa
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-plugin-taxonomy][feature/HIPPLUG-1487] 5 commits: HIPPLUG-1494 Update parent project to version 29.3-SNAPSHOT

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/HIPPLUG-1487 at cms-community / 
hippo-plugin-taxonomy


Commits:
6a739eed by Arent-Jan Banck at 2017-10-05T16:23:30+02:00
HIPPLUG-1494 Update parent project to version 29.3-SNAPSHOT

- - - - -
b1773ef1 by Tobias Jeger at 2017-10-11T15:47:02+02:00
HIPPLUG-1497 Fix bootstrap warnings

(cherry picked from commit 94125ea358684bc22084aeb6d74490a4261f5b97)

- - - - -
2c7e90ab by Tobias Jeger at 2017-10-30T14:45:43+01:00
HIPPLUG-1502 Move content categorization from demo to plugin

- - - - -
6fb6346d by Tobias Jeger at 2017-10-30T14:55:30+01:00
HIPPLUG-1502 Fix auto-export setup in demo project

- - - - -
a2e0cfcb by Jeroen Hoffman at 2017-11-20T11:28:13+01:00
HIPPLUG-1487 Merge branch master into feature/HIPPLUG-1487

# Conflicts:
#   demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml

- - - - -


6 changed files:

- addon/repository/src/main/resources/hcm-config/main.yaml
- demo/plugin/src/main/resources/hcm-config/main.yaml
- demo/repository-data/src/main/resources/hcm-config/hst-sites.yaml
- demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml
- demo/repository-data/src/main/resources/hcm-config/main.yaml
- pom.xml


Changes:

=
addon/repository/src/main/resources/hcm-config/main.yaml
=
--- a/addon/repository/src/main/resources/hcm-config/main.yaml
+++ b/addon/repository/src/main/resources/hcm-config/main.yaml
@@ -3,3 +3,6 @@ definitions:
 hippotaxonomy:
   uri: http://www.hippoecm.org/hippotaxonomy/nt/1.2
   cnd: hippotaxonomy.cnd
+  config:
+/content/taxonomies:
+  .meta:category: content


=
demo/plugin/src/main/resources/hcm-config/main.yaml
=
--- a/demo/plugin/src/main/resources/hcm-config/main.yaml
+++ b/demo/plugin/src/main/resources/hcm-config/main.yaml
@@ -2,3 +2,8 @@ definitions:
   config:
 /hippo:namespaces/hippotaxonomy/taxonomy/editor:templates/_default_/root:
   plugin.class: 
org.onehippo.taxonomy.demo.plugin.AdditionalFieldCustomTaxonomyEditorPlugin
+/hippo:configuration/hippo:modules/autoexport/hippo:moduleconfig:
+  autoexport:modules:
+operation: add
+type: string
+value: ['plugin']
\ No newline at end of file


=
demo/repository-data/src/main/resources/hcm-config/hst-sites.yaml
=
--- a/demo/repository-data/src/main/resources/hcm-config/hst-sites.yaml
+++ b/demo/repository-data/src/main/resources/hcm-config/hst-sites.yaml
@@ -1,7 +1,6 @@
 definitions:
   config:
 /hst:hst/hst:sites:
-  jcr:primaryType: hst:sites
   /taxonomydemo-nl:
 jcr:primaryType: hst:site
 hst:content: /content/documents


=
demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml
=
--- a/demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml
+++ b/demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml
@@ -1,9 +1,6 @@
 definitions:
   config:
-/hst:hst/hst:hosts:
-  jcr:primaryType: hst:virtualhosts
-  hst:defaultcontextpath: /site
-  /dev-localhost:
+/hst:hst/hst:hosts/dev-localhost:
 jcr:primaryType: hst:virtualhostgroup
 hst:cmslocation: http://localhost:8080/cms
 /localhost:


=
demo/repository-data/src/main/resources/hcm-config/main.yaml
=
--- a/demo/repository-data/src/main/resources/hcm-config/main.yaml
+++ b/demo/repository-data/src/main/resources/hcm-config/main.yaml
@@ -37,5 +37,3 @@ definitions:
 operation: add
 type: string
 value: [sitewriters]
-/content/taxonomies:
-  .meta:category: content


=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   
 org.onehippo.cms7
 hippo-cms7-project
-29
+29.3-SNAPSHOT
   
 
   Hippo Plugin Taxonomy



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/8038802bc11b194edfdd2357b371b79bca67af69...a2e0cfcbca2340f52d6c1b9a7856f058609b6ccf

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/8038802bc11b194edfdd2357b371b79bca67af69...a2e0cfcbca2340f52d6c1b9a7856f058609b6ccf
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][release/5.0] HSTTWO-4167 (cherry pick merge fix) remove unused variable, add final, reuse 'titleKey' variable

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/5.0 at cms-community / 
hippo-site-toolkit


Commits:
2208d4ff by Jeroen Hoffman at 2017-11-17T11:46:13+01:00
HSTTWO-4167 (cherry pick merge fix) remove unused variable, add final, reuse 
titleKey variable

- - - - -


1 changed file:

- 
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java


Changes:

=
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
=
--- 
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
+++ 
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
@@ -273,9 +273,8 @@ public class ParametersInfoProcessor {
 final Multimap<String, ContainerItemComponentPropertyRepresentation> 
fieldGroupProperties = LinkedHashMultimap.create();
 
 for (final Class interfaceClass : 
getBreadthFirstInterfaceHierarchy(classType)) {
-Multimap<String, ContainerItemComponentPropertyRepresentation> 
interfaceClassFieldGroupProperties = LinkedHashMultimap.create();
 final FieldGroupList fieldGroupList = 
interfaceClass.getAnnotation(FieldGroupList.class);
-Set uniquePropertiesForInterfaceClass = new HashSet<>();
+final Set uniquePropertiesForInterfaceClass = new 
HashSet<>();
 if (fieldGroupList != null) {
 final FieldGroup[] fieldGroups = fieldGroupList.value();
 if (fieldGroups != null && fieldGroups.length > 0) {
@@ -290,10 +289,10 @@ public class ParametersInfoProcessor {
 final ContainerItemComponentPropertyRepresentation 
property = propertyMap.get(propertyName);
 if 
(!uniquePropertiesForInterfaceClass.add(propertyName)) {
 log.warn("Ignoring duplicate parameter '{}' in 
field group '{}' of parameters info interface '{}'",
-propertyName, fieldGroup.titleKey(), 
classType.getCanonicalName());
+propertyName, titleKey, 
classType.getCanonicalName());
 } else if (property == null) {
-log.warn("Ignoring unknown parameter '{}' in 
parameters info interface '{}'",
-propertyName, 
classType.getCanonicalName());
+log.warn("Ignoring unknown parameter '{}' in 
field group '{}' of parameters info interface '{}'",
+propertyName, titleKey, 
classType.getCanonicalName());
 } else if 
(fieldGroupProperties.containsValue(property)) {
 // valid if FieldGroup is (re)defined in 
inherited Info Class
 log.debug("Parameter '{}' in field group '{}' 
of parameters info interface '{}' was already added to list.",



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/2208d4ffa2039bf8bd56065c11023960bfd8537d
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][master] 2 commits: HSTTWO-4168 [Fwd port to 12.1] Using Component Info inheritance leads to…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch master at cms-community / hippo-site-toolkit


Commits:
633a7e1e by Jeroen Hoffman at 2017-11-17T11:38:08+01:00
HSTTWO-4168 [Fwd port to 12.1] Using Component Info inheritance leads to 
Ignoring duplicate parameter warnings

- - - - -
e990b143 by Jeroen Hoffman at 2017-11-17T11:41:09+01:00
HSTTWO-4168 (merge fix) remove unused variable, add final, reuse 
titleKey variable

- - - - -


2 changed files:

- 
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
- 
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessorTest.java


Changes:

=
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
=
--- 
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
+++ 
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
@@ -20,6 +20,7 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
@@ -273,6 +274,7 @@ public class ParametersInfoProcessor {
 
 for (final Class interfaceClass : 
getBreadthFirstInterfaceHierarchy(classType)) {
 final FieldGroupList fieldGroupList = 
interfaceClass.getAnnotation(FieldGroupList.class);
+final Set uniquePropertiesForInterfaceClass = new 
HashSet<>();
 if (fieldGroupList != null) {
 final FieldGroup[] fieldGroups = fieldGroupList.value();
 if (fieldGroups != null && fieldGroups.length > 0) {
@@ -285,13 +287,19 @@ public class ParametersInfoProcessor {
 }
 for (final String propertyName : fieldGroup.value()) {
 final ContainerItemComponentPropertyRepresentation 
property = propertyMap.get(propertyName);
-if (property == null) {
-log.warn("Ignoring unknown parameter '{}' in 
parameters info interface '{}'",
-propertyName, 
classType.getCanonicalName());
-} else if 
(fieldGroupProperties.containsValue(property)) {
+if 
(!uniquePropertiesForInterfaceClass.add(propertyName)) {
 log.warn("Ignoring duplicate parameter '{}' in 
field group '{}' of parameters info interface '{}'",
-new Object[]{ propertyName, 
fieldGroup.titleKey(), classType.getCanonicalName() });
+propertyName, titleKey, 
classType.getCanonicalName());
+} else if (property == null) {
+log.warn("Ignoring unknown parameter '{}' in 
field group '{}' of parameters info interface '{}'",
+propertyName, titleKey, 
classType.getCanonicalName());
+} else if 
(fieldGroupProperties.containsValue(property)) {
+// valid if FieldGroup is (re)defined in 
inherited Info Class
+log.debug("Parameter '{}' in field group '{}' 
of parameters info interface '{}' was already added to list.",
+ propertyName, fieldGroup.titleKey(), 
classType.getCanonicalName());
 } else {
+log.debug("Adding parameter '{}' to field 
group '{}' of parameters info interface '{}'",
+propertyName, titleKey, 
classType.getCanonicalName());
 property.setGroupLabel(groupLabel);
 fieldGroupProperties.put(titleKey, property);
 }
@@ -362,7 +370,7 @@ public class ParametersInfoProcessor {
  * hierarchy BREADTH FIRST traversal. Empty array if there are no resource 
bundles at all
  */
 protected static final ResourceBundle[] getResourceBundles(final 
ParametersInfo parameterInfo, final Locale locale) {
-final List resourceBundles = new 
ArrayList();
+final List resourceBundles = new ArrayList<>();
 
 final List<Class> breadthFirstInterfaceHierarchy = 
getBreadthFirstInterfaceHierarchy(parameterInfo.type());
 for (final Class clazz : breadthFirstInterfaceHierarchy) {


=
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessorTest.java
=

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][release/5.0] HSTTWO-4167 [Fwd port to 12.0] Using Component Info inheritance leads to…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/5.0 at cms-community / 
hippo-site-toolkit


Commits:
d5613a4c by Jeroen Hoffman at 2017-11-17T11:08:43+01:00
HSTTWO-4167 [Fwd port to 12.0] Using Component Info inheritance leads to 
Ignoring duplicate parameter warnings

- - - - -


2 changed files:

- 
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
- 
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessorTest.java


Changes:

=
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
=
--- 
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
+++ 
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
@@ -20,6 +20,7 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
@@ -272,7 +273,9 @@ public class ParametersInfoProcessor {
 final Multimap<String, ContainerItemComponentPropertyRepresentation> 
fieldGroupProperties = LinkedHashMultimap.create();
 
 for (final Class interfaceClass : 
getBreadthFirstInterfaceHierarchy(classType)) {
+Multimap<String, ContainerItemComponentPropertyRepresentation> 
interfaceClassFieldGroupProperties = LinkedHashMultimap.create();
 final FieldGroupList fieldGroupList = 
interfaceClass.getAnnotation(FieldGroupList.class);
+Set uniquePropertiesForInterfaceClass = new HashSet<>();
 if (fieldGroupList != null) {
 final FieldGroup[] fieldGroups = fieldGroupList.value();
 if (fieldGroups != null && fieldGroups.length > 0) {
@@ -285,13 +288,19 @@ public class ParametersInfoProcessor {
 }
 for (final String propertyName : fieldGroup.value()) {
 final ContainerItemComponentPropertyRepresentation 
property = propertyMap.get(propertyName);
-if (property == null) {
+if 
(!uniquePropertiesForInterfaceClass.add(propertyName)) {
+log.warn("Ignoring duplicate parameter '{}' in 
field group '{}' of parameters info interface '{}'",
+propertyName, fieldGroup.titleKey(), 
classType.getCanonicalName());
+} else if (property == null) {
 log.warn("Ignoring unknown parameter '{}' in 
parameters info interface '{}'",
 propertyName, 
classType.getCanonicalName());
 } else if 
(fieldGroupProperties.containsValue(property)) {
-log.warn("Ignoring duplicate parameter '{}' in 
field group '{}' of parameters info interface '{}'",
-new Object[]{ propertyName, 
fieldGroup.titleKey(), classType.getCanonicalName() });
+// valid if FieldGroup is (re)defined in 
inherited Info Class
+log.debug("Parameter '{}' in field group '{}' 
of parameters info interface '{}' was already added to list.",
+ propertyName, fieldGroup.titleKey(), 
classType.getCanonicalName());
 } else {
+log.debug("Adding parameter '{}' to field 
group '{}' of parameters info interface '{}'",
+propertyName, titleKey, 
classType.getCanonicalName());
 property.setGroupLabel(groupLabel);
 fieldGroupProperties.put(titleKey, property);
 }
@@ -362,7 +371,7 @@ public class ParametersInfoProcessor {
  * hierarchy BREADTH FIRST traversal. Empty array if there are no resource 
bundles at all
  */
 protected static final ResourceBundle[] getResourceBundles(final 
ParametersInfo parameterInfo, final Locale locale) {
-final List resourceBundles = new 
ArrayList();
+final List resourceBundles = new ArrayList<>();
 
 final List<Class> breadthFirstInterfaceHierarchy = 
getBreadthFirstInterfaceHierarchy(parameterInfo.type());
 for (final Class clazz : breadthFirstInterfaceHierarchy) {


=
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessorTest.java
=
--- 
a/client-modules/page-compos

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Deleted branch bugfix/HSTTWO-4163

[Jeroen Hoffman]

Jeroen Hoffman deleted branch bugfix/HSTTWO-4163 at cms-community / 
hippo-site-toolkit

---

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][release/4.2] 6 commits: HSTTWO-4163 only warn about duplicate field group properties defined in the same class

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/4.2 at cms-community / 
hippo-site-toolkit


Commits:
0a1e08b8 by Bert Leunis at 2017-11-09T16:18:43+01:00
HSTTWO-4163 only warn about duplicate field group properties defined in the 
same class

- - - - -
ca4bc4d6 by Bert Leunis at 2017-11-10T13:51:41+01:00
HSTTWO-4163 warning for duplicates in the same class, logging of duplicate 
properties overall now debug level

- - - - -
de1318df by Jeroen Hoffman at 2017-11-15T14:25:12+01:00
HSTTWO-4163 Merge branch release/4.2 into bugfix/HSTTWO-4163

- - - - -
bf4f04bb by Jeroen Hoffman at 2017-11-15T15:33:53+01:00
HSTTWO-4163 reuse titleKey variable; add a final

- - - - -
f2c762a8 by Jeroen Hoffman at 2017-11-15T16:35:37+01:00
HSTTWO-4163 add debug statement for when adding a parameter to a field group

- - - - -
d39a04f7 by Jeroen Hoffman at 2017-11-17T10:47:58+01:00
HSTTWO-4163 Reintegrate branch bugfix/HSTTWO-4163 into release/4.2

- - - - -


2 changed files:

- 
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
- 
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessorTest.java


Changes:

=
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
=
--- 
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
+++ 
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2011-2016 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.
@@ -20,6 +20,7 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
@@ -240,6 +241,7 @@ public class ParametersInfoProcessor {
 
 for (Class interfaceClass : 
getBreadthFirstInterfaceHierarchy(classType)) {
 final FieldGroupList fieldGroupList = 
interfaceClass.getAnnotation(FieldGroupList.class);
+final Set uniquePropertiesForInterfaceClass = new 
HashSet<>();
 if (fieldGroupList != null) {
 FieldGroup[] fieldGroups = fieldGroupList.value();
 if (fieldGroups != null && fieldGroups.length > 0) {
@@ -252,13 +254,19 @@ public class ParametersInfoProcessor {
 }
 for (final String propertyName : fieldGroup.value()) {
 final ContainerItemComponentPropertyRepresentation 
property = propertyMap.get(propertyName);
-if (property == null) {
-log.warn("Ignoring unknown parameter '{}' in 
parameters info interface '{}'",
-propertyName, 
classType.getCanonicalName());
-} else if 
(fieldGroupProperties.containsValue(property)) {
+if 
(!uniquePropertiesForInterfaceClass.add(propertyName)) {
 log.warn("Ignoring duplicate parameter '{}' in 
field group '{}' of parameters info interface '{}'",
-new Object[]{ propertyName, 
fieldGroup.titleKey(), classType.getCanonicalName() });
+propertyName, titleKey, 
classType.getCanonicalName());
+} else if (property == null) {
+log.warn("Ignoring unknown parameter '{}' in 
field group '{}' of parameters info interface '{}'",
+propertyName, titleKey, 
classType.getCanonicalName());
+} else if 
(fieldGroupProperties.containsValue(property)) {
+// valid if FieldGroup is (re)defined in 
inherited Info Class
+log.debug("Parameter '{}' in field group '{}' 
of parameters info interface '{}' was already added to list.",
+ propertyName, titleKey, 
classType.getCanonicalName());
 } else {
+log.debug("Adding parameter '{}' to field 
group '{}' of parameters info interface '{}'",
+propertyName, titleKey, 
classType.getCanonicalName());
 property.setGroupLabel(groupLabel);
 fieldGroupProperties.put(titleKey, property);
 }

[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][master] HIPPLUG-1481 add Apache license headers where missing

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch master at cms-community / hippo-plugin-poll


Commits:
db55925c by Jeroen Hoffman at 2017-11-14T09:58:25+01:00
HIPPLUG-1481 add Apache license headers where missing

- - - - -


7 changed files:

- essentials-demo-feature/pom.xml
- essentials-demo-feature/src/main/resources/META-INF/instructions.xml
- 
essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html
- essentials-demo-feature/src/main/resources/META-INF/web-fragment.xml
- essentials-demo-feature/src/main/resources/xml/menu-item.xml
- 
essentials-demo-feature/src/main/resources/xml/namespace-customPollDocument.xml
- pom.xml


Changes:

=
essentials-demo-feature/pom.xml
=
--- a/essentials-demo-feature/pom.xml
+++ b/essentials-demo-feature/pom.xml
@@ -1,4 +1,19 @@
 
+
 
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
   4.0.0


=
essentials-demo-feature/src/main/resources/META-INF/instructions.xml
=
--- a/essentials-demo-feature/src/main/resources/META-INF/instructions.xml
+++ b/essentials-demo-feature/src/main/resources/META-INF/instructions.xml
@@ -1,5 +1,19 @@
 
+
 http://www.onehippo.org/essentials/instructions;>
 
   


=
essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html
=
--- 
a/essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html
+++ 
b/essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html
@@ -1,3 +1,18 @@
+
 


=
essentials-demo-feature/src/main/resources/META-INF/web-fragment.xml
=
--- a/essentials-demo-feature/src/main/resources/META-INF/web-fragment.xml
+++ b/essentials-demo-feature/src/main/resources/META-INF/web-fragment.xml
@@ -1,4 +1,19 @@
 
+
 http://java.sun.com/xml/ns/javaee; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd;>


=
essentials-demo-feature/src/main/resources/xml/menu-item.xml
=
--- a/essentials-demo-feature/src/main/resources/xml/menu-item.xml
+++ b/essentials-demo-feature/src/main/resources/xml/menu-item.xml
@@ -1,4 +1,19 @@
 
+
 http://www.jcp.org/jcr/sv/1.0;>
   
 hst:sitemenuitem


=
essentials-demo-feature/src/main/resources/xml/namespace-customPollDocument.xml
=
--- 
a/essentials-demo-feature/src/main/resources/xml/namespace-customPollDocument.xml
+++ 
b/essentials-demo-feature/src/main/resources/xml/namespace-customPollDocument.xml
@@ -1,4 +1,19 @@
 
+
 http://www.jcp.org/jcr/sv/1.0;>
   
 hipposysedit:templatetype


=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 
 

[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll] Deleted branch feature/HIPPLUG-1481

[Jeroen Hoffman]

Jeroen Hoffman deleted branch feature/HIPPLUG-1481 at cms-community / 
hippo-plugin-poll

---

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-plugin-poll][master] 12 commits: HIPPLUG-1481 add demo as essentials plugin

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch master at cms-community / hippo-plugin-poll


Commits:
223557d0 by Bert Leunis at 2017-08-15T13:45:58+02:00
HIPPLUG-1481 add demo as essentials plugin

- - - - -
a66db3e4 by Jeroen Hoffman at 2017-10-18T12:02:04+02:00
HIPPLUG-1481 Merge branch master into feature/HIPPLUG-1481

- - - - -
35747858 by Jeroen Hoffman at 2017-10-20T10:07:15+02:00
HIPPLUG-1481 fix for the example polldata XML imported into /polldemo, must be 
/polldata/{{ namespace}}.

Rename the new artifact hippo-plugin-poll-essentials-demo-feature 
in module essentials-demo-feature

- - - - -
6b6c8df5 by Jeroen Hoffman at 2017-10-20T10:12:02+02:00
HIPPLUG-1481 remove unused folder/files

- - - - -
736a0004 by Jeroen Hoffman at 2017-10-20T10:15:25+02:00
HIPPLUG-1481 temp rename (camelCase file  issue)

- - - - -
17bf49f1 by Jeroen Hoffman at 2017-10-20T10:17:04+02:00
HIPPLUG-1481 temp rename back (back to lowercase custom)

- - - - -
d915e268 by Jeroen Hoffman at 2017-10-20T10:19:07+02:00
HIPPLUG-1481 remove the demo files, except the new README

- - - - -
592743a2 by Jeroen Hoffman at 2017-10-20T10:25:21+02:00
HIPPLUG-1481 in README, describe what the feature does.

- - - - -
bd062bff by Jeroen Hoffman at 2017-10-20T10:41:16+02:00
HIPPLUG-1481 remove remaining _demo_creation (shouldve been gone before)

- - - - -
26704d11 by Jeroen Hoffman at 2017-11-13T15:16:38+01:00
HIPPLUG-1481 merge 3 instructionSet elements into 1 because having 
optional parts is not applicable here

- - - - -
29db7c7e by Jeroen Hoffman at 2017-11-13T15:20:42+01:00
HIPPLUG-1481 Reintegrate branch feature/HIPPLUG-1481 into master

- - - - -
91f6b876 by Jeroen Hoffman at 2017-11-13T16:24:01+01:00
HIPPLUG-1481 Strip all sub-elements of essentials-demo-feature/pom.xml, just 
leaving the basics will do

- - - - -


30 changed files:

- demo/README.txt
- − demo/_demo_creation/README.txt
- − demo/bootstrap/configuration/pom.xml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/modules/autoexport-module.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-poll-document.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-poll-folder.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-resource-bundle.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-untranslated-folder.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/default/catalog.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/abstractpages.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/abstractpages/base.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/catalog.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/components.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages/custompoll.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages/homepage.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages/pagenotfound.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/prototypepages.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/sitemap.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/sitemenus.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/templates.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/workspace.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/workspace/channel.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/workspace/containers.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/workspace/pages.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/workspace/sitemap.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/workspace/sitemenus.yaml
- − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/hosts.yaml
- − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/sites.yaml


The diff was not included because it is too large.


View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll

[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][feature/HIPPLUG-1481] HIPPLUG-1481 merge 3 elements into 1 because having optional…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / 
hippo-plugin-poll


Commits:
26704d11 by Jeroen Hoffman at 2017-11-13T15:16:38+01:00
HIPPLUG-1481 merge 3 instructionSet elements into 1 because having 
optional parts is not applicable here

- - - - -


4 changed files:

- demo/README.txt
- essentials-demo-feature/README.txt
- essentials-demo-feature/src/main/resources/META-INF/instructions.xml
- 
essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html


Changes:

=
demo/README.txt
=
--- a/demo/README.txt
+++ b/demo/README.txt
@@ -17,7 +17,7 @@ How to generate a demo project for the Polls feature
 - With Essentials, set up the project with the default settings.
   Note that JSP for templating language is not supported for the Polls Demo 
feature.
 
-- With Essentials, install Polls feature, then rebuild && run twice 
((boarding, installing).
+- With Essentials, install Polls feature, then rebuild && run twice (boarding, 
installing).
 
 - With Essentials, install Polls Demo feature, then rebuild && run.
 


=
essentials-demo-feature/README.txt
=
--- a/essentials-demo-feature/README.txt
+++ b/essentials-demo-feature/README.txt
@@ -1,6 +1,6 @@
-Hippo Essentials Plugin Feature
-===
-This module contains a Hippo Essentials Plugin Feature. It adds a custom poll 
document: a document in the project
+Hippo Essentials Demo Feature
+=
+This module contains a Hippo Essentials Demo Feature. It adds a custom poll 
document: a document in the project
 namespace with a title and the poll compound. It also adds a rendering 
template and some HST configuration for it.
 
 To use this feature, add a dependency to this artifact to the Essentials 
module of a Hippo project. After a (re)build it


=
essentials-demo-feature/src/main/resources/META-INF/instructions.xml
=
--- a/essentials-demo-feature/src/main/resources/META-INF/instructions.xml
+++ b/essentials-demo-feature/src/main/resources/META-INF/instructions.xml
@@ -3,38 +3,31 @@
 http://www.onehippo.org/essentials/instructions;>
 
   
-
+
 
-
+
+
+
 
 
 
-  
 
-  
-  
 
 
-
-  
-
-  
-  
-  
-  
-  
-  
 
-  
-  
-
+
+
 
 
 
 
 
-
+
+
+
+
+
 
   
 


=
essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html
=
--- 
a/essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html
+++ 
b/essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html
@@ -1,7 +1,4 @@
 
-
-
-
-
+  has-no-templates="true">
+
\ No newline at end of file



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/26704d11b6ad7f19ccf6ca7d7e7aed4f2fb5b464

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/26704d11b6ad7f19ccf6ca7d7e7aed4f2fb5b464
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][release/4.2] 2 commits: CHANNELMGR-1530 Fix bug where DragulaJS is not loaded properly if the site has RequireJS loaded

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/4.2 at cms-community / 
hippo-addon-channel-manager


Commits:
dc147842 by Bert Leunis at 2017-11-03T17:02:28+01:00
CHANNELMGR-1530 Fix bug where DragulaJS is not loaded properly if the site has 
RequireJS loaded

- - - - -
dda5e114 by Jeroen Hoffman at 2017-11-09T12:38:43+01:00
CHANNELMGR-1530 reintegrate branch bugfix/CHANNELMGR-1530 into 
release/4.2

- - - - -


2 changed files:

- frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.js
- 
frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.spec.js


Changes:

=
frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.js
@@ -31,7 +31,8 @@ class DragDropService {
   HstService,
   PageStructureService,
   ScalingService,
-  ScrollService) {
+  ScrollService,
+  HippoIframeService) {
 'ngInject';
 
 this.$rootScope = $rootScope;
@@ -45,6 +46,7 @@ class DragDropService {
 this.PageStructureService = PageStructureService;
 this.ScalingService = ScalingService;
 this.ScrollService = ScrollService;
+this.HippoIframeService = HippoIframeService;
 
 this.draggingOrClicking = false;
 this.dropping = false;
@@ -135,12 +137,23 @@ class DragDropService {
 
   _injectDragula(iframe) {
 const appRootUrl = this.DomService.getAppRootUrl();
-
 const dragulaCss = 
`${appRootUrl}styles/dragula.min.css?antiCache=${this.ConfigService.antiCache}`;
 this.DomService.addCss(iframe, dragulaCss);
 
 const dragulaJs = 
`${appRootUrl}scripts/dragula.min.js?antiCache=${this.ConfigService.antiCache}`;
-return this.DomService.addScript(iframe, dragulaJs);
+this.requirejs = iframe.frameElement.contentWindow.require;
+
+if (!angular.isDefined(this.requirejs)) {
+  return this.DomService.addScript(iframe, dragulaJs);
+}
+
+const d = this.$q.defer();
+this.requirejs([dragulaJs], (dragula) => {
+  iframe.dragula = dragula;
+  d.resolve();
+});
+
+return d.promise;
   }
 
   _isContainerEnabled(containerElement) {


=
frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.spec.js
=
--- 
a/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.spec.js
+++ 
b/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.spec.js
@@ -25,6 +25,8 @@ describe('DragDropService', () => {
   let HstService;
   let ChannelService;
   let FeedbackService;
+  let DomService;
+  let ConfigService;
 
   let iframe;
   let canvas;
@@ -44,7 +46,9 @@ describe('DragDropService', () => {
 _PageStructureService_,
 _HstService_,
 _ChannelService_,
-_FeedbackService_) => {
+_FeedbackService_,
+_DomService_,
+_ConfigService_) => {
   $q = _$q_;
   DragDropService = _DragDropService_;
   ScalingService = _ScalingService_;
@@ -52,6 +56,8 @@ describe('DragDropService', () => {
   HstService = _HstService_;
   ChannelService = _ChannelService_;
   FeedbackService = _FeedbackService_;
+  DomService = _DomService_;
+  ConfigService = _ConfigService_;
 });
 
 spyOn(ChannelService, 'recordOwnChange');
@@ -506,4 +512,47 @@ describe('DragDropService', () => {
   done();
 });
   });
+
+  describe('DragulaJS injection', () => {
+const mockIframe = {
+  frameElement: {
+contentWindow: {}, // "require" attribtue is undefined
+  },
+};
+
+it('inject DragulaJS when RequireJS is not available using DomService', 
(done) => {
+  loadIframeFixture(() => {
+spyOn(DomService, 
'getAppRootUrl').and.returnValue('http://localhost:8080/cms/');
+ConfigService.antiCache = '123';
+const DragulaJSPath = 
`${DomService.getAppRootUrl()}scripts/dragula.min.js?antiCache=${ConfigService.antiCache}`;
+
+spyOn(DomService, 'addScript').and.returnValue($q.resolve());
+
+DragDropService._injectDragula(mockIframe);
+expect(DomService.addScript).toHaveBeenCalledWith(mockIframe, 
DragulaJSPath);
+
+done();
+  });
+});
+
+it('inject DragulaJS when RequireJS is available', (done) => {
+  loadIframeFixture(() => {
+mockIframe.frameElement.contentWindow = {
+  require: (modules, callback) => { callback('dragulaLoaded'); },
+};
+
+spyOn(DomService, 
'getAppRootUrl').and.returnValue('http://localhost:8080/cms/');
+ConfigService.antiCache = '123';
+
+spyOn(DomService, 'addScript');
+
+DragDropService._injectDragula(

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-1530

[Jeroen Hoffman]

Jeroen Hoffman deleted branch bugfix/CHANNELMGR-1530 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-cms-release][release/11.2] CMS-10615 bump CMS version to 4.2.7-SNAPSHOT on behalf of CMS-10960 and CMS-10964

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/11.2 at cms-community / 
hippo-cms-release


Commits:
114a46b2 by Jeroen Hoffman at 2017-10-31T09:26:17+01:00
CMS-10615 bump CMS version to 4.2.7-SNAPSHOT on behalf of CMS-10960 and 
CMS-10964

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 
4.2.2
 
3.2.1
 3.2.0
-4.2.6
+4.2.7-SNAPSHOT
 3.2.0
 3.2.0
 4.2.5-SNAPSHOT



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/114a46b24e6514c7a1c96bb8fe95062a7e3758f8

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/114a46b24e6514c7a1c96bb8fe95062a7e3758f8
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] Deleted branch bugfix/ESSENTIALS-1104

[Jeroen Hoffman]

Jeroen Hoffman deleted branch bugfix/ESSENTIALS-1104 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] 2 commits: ESSENTIALS-1104 improve beans structure

[Jeroen Hoffman]

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


Commits:
43320694 by Bert Leunis at 2017-10-17T13:07:54+02:00
ESSENTIALS-1104 improve beans structure

- - - - -
4502fe16 by Jeroen Hoffman at 2017-10-25T10:14:47+02:00
ESSENTIALS-1104 Reintegrate branch bugfix/ESSENTIALS-1104 into master

- - - - -


1 changed file:

- plugins/rest-services/src/main/resources/spring-plain-rest-api.xml


Changes:

=
plugins/rest-services/src/main/resources/spring-plain-rest-api.xml
=
--- a/plugins/rest-services/src/main/resources/spring-plain-rest-api.xml
+++ b/plugins/rest-services/src/main/resources/spring-plain-rest-api.xml
@@ -4,7 +4,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd;>
 
-
   
   
   
@@ -44,16 +43,27 @@
 
   
 
-  
+  
 
   
-
 
 
   
 
   
 
+  
+
+
+
+
+  
+
+
+  
+
+  
+
   
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-essentials/compare/f420535b269283403c5d3dbcbeed2ca2ec31da48...4502fe16ce099d76084a107b953fb7163c060de0

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-essentials/compare/f420535b269283403c5d3dbcbeed2ca2ec31da48...4502fe16ce099d76084a107b953fb7163c060de0
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-cms][release/4.2] CMS-10964 [Back port CMS-10941 to 11.2] Regression: three column layout for cms…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/4.2 at cms-community / hippo-cms


Commits:
04af1c36 by Jeroen Hoffman at 2017-10-24T10:51:18+02:00
CMS-10964 [Back port CMS-10941 to 11.2] Regression: three column layout for cms 
document gives errors

(cherry picked from commit 074b301d4433280fdefba354307b4562a7692cdf)

- - - - -


2 changed files:

- api/src/main/styling/styles/_editor.scss
- 
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java


Changes:

=
api/src/main/styling/styles/_editor.scss
=
--- a/api/src/main/styling/styles/_editor.scss
+++ b/api/src/main/styling/styles/_editor.scss
@@ -40,6 +40,12 @@
 float: right;
   }
 
+  .col40 {
+padding-right: 16px;
+width: 40%;
+float: left;
+  }
+
   .col70 {
 padding-right: 16px;
 width: 70%;
@@ -54,6 +60,7 @@
 
   .col20,
   .col30,
+  .col40,
   .col70,
   .col80 {
 box-sizing: border-box;


=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
=
--- 
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
+++ 
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-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.
@@ -490,20 +490,24 @@ public class RenderPluginEditorPlugin extends 
RenderPlugin implements ILayoutAwa
 }
 
 private Icon getTransitionIconByName(final String name) {
-switch (name) {
-case "up": {
-return Icon.CHEVRON_UP_CIRCLE;
-}
-case "down": {
-return Icon.CHEVRON_DOWN_CIRCLE;
-}
-case "left": {
-return Icon.CHEVRON_LEFT_CIRCLE;
-}
-case "right": {
-return Icon.CHEVRON_RIGHT_CIRCLE;
+if (name != null) {
+final String[] split = StringUtils.split(name, " ");
+switch (split[split.length - 1]) {
+case "up": {
+return Icon.CHEVRON_UP_CIRCLE;
+}
+case "down": {
+return Icon.CHEVRON_DOWN_CIRCLE;
+}
+case "left": {
+return Icon.CHEVRON_LEFT_CIRCLE;
+}
+case "right": {
+return Icon.CHEVRON_RIGHT_CIRCLE;
+}
 }
 }
-return null;
+log.warn("Undetermined transition icon by name '{}'; the name should 
be, or have as last word: 'up', 'down', 'left' or 'right'. Returning default 
icon.", name);
+return Icon.EXCLAMATION_CIRCLE;
 }
 }



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/04af1c3686ebe07db314bcaf9c526e682f91aab7
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-cms][release/5.0] CMS-10963 [Back port CMS-10941 to 12.0] Regression: three column layout for cms…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/5.0 at cms-community / hippo-cms


Commits:
c5ee50a1 by Jeroen Hoffman at 2017-10-24T10:44:43+02:00
CMS-10963 [Back port CMS-10941 to 12.0] Regression: three column layout for cms 
document gives errors

(cherry picked from commit 074b301d4433280fdefba354307b4562a7692cdf)

- - - - -


2 changed files:

- api/src/main/styling/styles/_editor.scss
- 
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java


Changes:

=
api/src/main/styling/styles/_editor.scss
=
--- a/api/src/main/styling/styles/_editor.scss
+++ b/api/src/main/styling/styles/_editor.scss
@@ -40,6 +40,12 @@
 float: right;
   }
 
+  .col40 {
+padding-right: 16px;
+width: 40%;
+float: left;
+  }
+
   .col70 {
 padding-right: 16px;
 width: 70%;
@@ -54,6 +60,7 @@
 
   .col20,
   .col30,
+  .col40,
   .col70,
   .col80 {
 box-sizing: border-box;


=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
=
--- 
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
+++ 
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-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.
@@ -490,20 +490,24 @@ public class RenderPluginEditorPlugin extends 
RenderPlugin implements ILayoutAwa
 }
 
 private Icon getTransitionIconByName(final String name) {
-switch (name) {
-case "up": {
-return Icon.CHEVRON_UP_CIRCLE;
-}
-case "down": {
-return Icon.CHEVRON_DOWN_CIRCLE;
-}
-case "left": {
-return Icon.CHEVRON_LEFT_CIRCLE;
-}
-case "right": {
-return Icon.CHEVRON_RIGHT_CIRCLE;
+if (name != null) {
+final String[] split = StringUtils.split(name, " ");
+switch (split[split.length - 1]) {
+case "up": {
+return Icon.CHEVRON_UP_CIRCLE;
+}
+case "down": {
+return Icon.CHEVRON_DOWN_CIRCLE;
+}
+case "left": {
+return Icon.CHEVRON_LEFT_CIRCLE;
+}
+case "right": {
+return Icon.CHEVRON_RIGHT_CIRCLE;
+}
 }
 }
-return null;
+log.warn("Undetermined transition icon by name '{}'; the name should 
be, or have as last word: 'up', 'down', 'left' or 'right'. Returning default 
icon.", name);
+return Icon.EXCLAMATION_CIRCLE;
 }
 }



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/c5ee50a1bc73378b8cae882c523bf6770735
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-cms] Deleted branch bugfix/CMS-10941

[Jeroen Hoffman]

Jeroen Hoffman deleted branch bugfix/CMS-10941 at cms-community / hippo-cms

---

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-cms][master] 5 commits: CMS-10941 also provide transition icon for more exotic transitions

[Jeroen Hoffman]

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


Commits:
c9a46833 by Bert Leunis at 2017-10-09T17:00:26+02:00
CMS-10941 also provide transition icon for more exotic transitions

- - - - -
2b96bbf0 by Bert Leunis at 2017-10-10T09:58:16+02:00
CMS-10941 add styling classes for 40% wide column, left aligned

- - - - -
a0b4cdfa by Jeroen Hoffman at 2017-10-23T15:10:08+02:00
CMS-10941 Merge branch master into bugfix/CMS-10941

- - - - -
074b301d by Jeroen Hoffman at 2017-10-24T10:27:38+02:00
CMS-10941 more informative log warning

- - - - -
93e5cca2 by Jeroen Hoffman at 2017-10-24T10:30:53+02:00
CMS-10941 Reintegrate branch bugfix/CMS-10941 into master

- - - - -


2 changed files:

- api/src/main/styling/styles/_editor.scss
- 
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java


Changes:

=
api/src/main/styling/styles/_editor.scss
=
--- a/api/src/main/styling/styles/_editor.scss
+++ b/api/src/main/styling/styles/_editor.scss
@@ -40,6 +40,12 @@
 float: right;
   }
 
+  .col40 {
+padding-right: 16px;
+width: 40%;
+float: left;
+  }
+
   .col70 {
 padding-right: 16px;
 width: 70%;
@@ -54,6 +60,7 @@
 
   .col20,
   .col30,
+  .col40,
   .col70,
   .col80 {
 box-sizing: border-box;


=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
=
--- 
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
+++ 
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-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.
@@ -490,20 +490,24 @@ public class RenderPluginEditorPlugin extends 
RenderPlugin implements ILayoutAwa
 }
 
 private Icon getTransitionIconByName(final String name) {
-switch (name) {
-case "up": {
-return Icon.CHEVRON_UP_CIRCLE;
-}
-case "down": {
-return Icon.CHEVRON_DOWN_CIRCLE;
-}
-case "left": {
-return Icon.CHEVRON_LEFT_CIRCLE;
-}
-case "right": {
-return Icon.CHEVRON_RIGHT_CIRCLE;
+if (name != null) {
+final String[] split = StringUtils.split(name, " ");
+switch (split[split.length - 1]) {
+case "up": {
+return Icon.CHEVRON_UP_CIRCLE;
+}
+case "down": {
+return Icon.CHEVRON_DOWN_CIRCLE;
+}
+case "left": {
+return Icon.CHEVRON_LEFT_CIRCLE;
+}
+case "right": {
+return Icon.CHEVRON_RIGHT_CIRCLE;
+}
 }
 }
-return null;
+log.warn("Undetermined transition icon by name '{}'; the name should 
be, or have as last word: 'up', 'down', 'left' or 'right'. Returning default 
icon.", name);
+return Icon.EXCLAMATION_CIRCLE;
 }
 }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/40ce3065373b56eff4b58f861444b7d19cc5b074...93e5cca2a53c622bfacefa1b0e89c0aa93bacd71

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/40ce3065373b56eff4b58f861444b7d19cc5b074...93e5cca2a53c622bfacefa1b0e89c0aa93bacd71
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-cms][bugfix/CMS-10941] CMS-10941 more informative log warning

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch bugfix/CMS-10941 at cms-community / hippo-cms


Commits:
074b301d by Jeroen Hoffman at 2017-10-24T10:27:38+02:00
CMS-10941 more informative log warning

- - - - -


1 changed file:

- 
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java


Changes:

=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
=
--- 
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
+++ 
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
@@ -507,7 +507,7 @@ public class RenderPluginEditorPlugin extends RenderPlugin 
implements ILayoutAwa
 }
 }
 }
-log.warn("Unknown transition \"{}\". Returning default icon.", name);
+log.warn("Undetermined transition icon by name '{}'; the name should 
be, or have as last word: 'up', 'down', 'left' or 'right'. Returning default 
icon.", name);
 return Icon.EXCLAMATION_CIRCLE;
 }
 }



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/074b301d4433280fdefba354307b4562a7692cdf
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-cms][release/5.0] CMS-10962 [back port CMS_10839 to 12.0] narrow down the styling of checkbox and…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/5.0 at cms-community / hippo-cms


Commits:
54cfc1a3 by Jeroen Hoffman at 2017-10-23T16:31:43+02:00
CMS-10962 [back port CMS_10839 to 12.0] narrow down the styling of checkbox and 
label to only this plugin

(cherry picked from commit 3427df93da6fe7a19b046c0a0b3bc0048f56408b)

- - - - -


2 changed files:

- api/src/main/styling/styles/_editor.scss
- 
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html


Changes:

=
api/src/main/styling/styles/_editor.scss
=
--- a/api/src/main/styling/styles/_editor.scss
+++ b/api/src/main/styling/styles/_editor.scss
@@ -114,6 +114,10 @@
 width: auto;
   }
 
+  .hippo-editor-field-boolean > input[type="checkbox"] + label {
+margin-left: 8px;
+  }
+
   input[type="submit"] {
 width: auto;
   }


=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
=
--- 
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
+++ 
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
@@ -1,5 +1,5 @@
 
 http://wicket.apache.org/;>
   
- 
+ 

-   [ 
mixin ]
+   
+ [ 
mixin ]
+   
  
   
 



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/54cfc1a37cbd469724b4099ac4786cad8fb50b3b
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-cms][release/4.2] CMS-10960 [back port CMS_10839 to 11.2] narrow down the styling of checkbox and…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/4.2 at cms-community / hippo-cms


Commits:
0a6ed6f1 by Jeroen Hoffman at 2017-10-23T09:37:10+02:00
CMS-10960 [back port CMS_10839 to 11.2] narrow down the styling of checkbox and 
label to only this plugin

(cherry picked from commit 3427df93da6fe7a19b046c0a0b3bc0048f56408b)

- - - - -


2 changed files:

- api/src/main/styling/styles/_editor.scss
- 
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html


Changes:

=
api/src/main/styling/styles/_editor.scss
=
--- a/api/src/main/styling/styles/_editor.scss
+++ b/api/src/main/styling/styles/_editor.scss
@@ -114,6 +114,10 @@
 width: auto;
   }
 
+  .hippo-editor-field-boolean > input[type="checkbox"] + label {
+margin-left: 8px;
+  }
+
   input[type="submit"] {
 width: auto;
   }


=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
=
--- 
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
+++ 
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
@@ -1,5 +1,5 @@
 
 http://wicket.apache.org/;>
   
- 
+ 

-   [ 
mixin ]
+   
+ [ 
mixin ]
+   
  
   
 



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/0a6ed6f1801de6e3a7d3a12b6d7ea8b0eb4242d9
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-cms] Deleted branch bugfix/CMS-10839

[Jeroen Hoffman]

Jeroen Hoffman deleted branch bugfix/CMS-10839 at cms-community / hippo-cms

---

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-cms][master] 4 commits: CMS-10839 field styling

[Jeroen Hoffman]

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


Commits:
5fc92b30 by Bert Leunis at 2017-09-28T16:42:21+02:00
CMS-10839 field styling

- - - - -
3427df93 by Bert Leunis at 2017-10-05T16:15:33+02:00
CMS-10839 narrow down the styling of checkbox and label to only this plugin

- - - - -
4ecd5b0c by Jeroen Hoffman at 2017-10-19T21:33:08+02:00
CMS-10839 Merge branch master into bugfix/CMS-10839

- - - - -
40ce3065 by Jeroen Hoffman at 2017-10-20T15:54:29+02:00
CMS-10839 Reintegrate branch bugfix/CMS-10839 to master

- - - - -


2 changed files:

- api/src/main/styling/styles/_editor.scss
- 
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html


Changes:

=
api/src/main/styling/styles/_editor.scss
=
--- a/api/src/main/styling/styles/_editor.scss
+++ b/api/src/main/styling/styles/_editor.scss
@@ -114,6 +114,10 @@
 width: auto;
   }
 
+  .hippo-editor-field-boolean > input[type="checkbox"] + label {
+margin-left: 8px;
+  }
+
   input[type="submit"] {
 width: auto;
   }


=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
=
--- 
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
+++ 
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
@@ -1,5 +1,5 @@
 
 http://wicket.apache.org/;>
   
- 
+ 

-   [ 
mixin ]
+   
+ [ 
mixin ]
+   
  
   
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/182a4325ae337bae840c65cb7c759075ecb6a2cb...40ce3065373b56eff4b58f861444b7d19cc5b074

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/182a4325ae337bae840c65cb7c759075ecb6a2cb...40ce3065373b56eff4b58f861444b7d19cc5b074
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-plugin-poll][feature/HIPPLUG-1481] HIPPLUG-1481 remove remaining _demo_creation (should've been gone before)

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / 
hippo-plugin-poll


Commits:
bd062bff by Jeroen Hoffman at 2017-10-20T10:41:16+02:00
HIPPLUG-1481 remove remaining _demo_creation (shouldve been gone before)

- - - - -


2 changed files:

- demo/README.txt
- − demo/_demo_creation/import/polldata-polldemo.xml


Changes:

=
demo/README.txt
=
--- a/demo/README.txt
+++ b/demo/README.txt
@@ -4,7 +4,7 @@ How to generate a demo project for the Polls feature
 
 1) Generate a project from the archetype.
 
-2) In essentials/pom.xml, add:
+2) To demo a custom poll document with title and poll compound, add to 
essentials/pom.xml:
 
 
   org.onehippo.cms7
@@ -14,8 +14,8 @@ How to generate a demo project for the Polls feature

 3) Build && run locally.
 
-- With Essentials, set up with the default settings.
-  JSP for templating language is not supported for the Polls Demo feature.
+- With Essentials, set up the project with the default settings.
+  Note that JSP for templating language is not supported for the Polls Demo 
feature.
 
 - With Essentials, install Polls feature, then rebuild && run twice 
((boarding, installing).
 


=
demo/_demo_creation/import/polldata-polldemo.xml deleted
=
--- a/demo/_demo_creation/import/polldata-polldemo.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-http://www.jcp.org/jcr/sv/1.0; sv:name="polldemo">
-  
-poll:polldata
-  
-  
-mix:lockable
-  
-  
-
-  poll:polldata
-
-
-  mix:lockable
-
-
-  
-poll:polldata
-  
-  
-mix:lockable
-  
-  
-
-  poll:votes
-
-
-  mix:lockable
-
-
-  526
-
-  
-  
-
-  poll:votes
-
-
-  mix:lockable
-
-
-  119
-
-  
-
-
-  
-poll:polldata
-  
-  
-mix:lockable
-  
-  
-
-  poll:votes
-
-
-  mix:lockable
-
-
-  64
-
-  
-  
-
-  poll:votes
-
-
-  mix:lockable
-
-
-  47
-
-  
-
-  
-



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/bd062bff24e8a30f1944bae08a011918528e4107

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/bd062bff24e8a30f1944bae08a011918528e4107
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-plugin-poll][feature/HIPPLUG-1481] HIPPLUG-1481 in README, describe what the feature does.

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / 
hippo-plugin-poll


Commits:
592743a2 by Jeroen Hoffman at 2017-10-20T10:25:21+02:00
HIPPLUG-1481 in README, describe what the feature does.

- - - - -


1 changed file:

- essentials-demo-feature/README.txt


Changes:

=
essentials-demo-feature/README.txt
=
--- a/essentials-demo-feature/README.txt
+++ b/essentials-demo-feature/README.txt
@@ -1,6 +1,9 @@
 Hippo Essentials Plugin Feature
 ===
-This project is a Hippo Essentials Plugin Feature. Add this as a dependency to 
the Essentials module of a Hippo
-project. After a (re)build it will show up as a Feature in the Feature Library.
+This module contains a Hippo Essentials Plugin Feature. It adds a custom poll 
document: a document in the project
+namespace with a title and the poll compound. It also adds a rendering 
template and some HST configuration for it.
+
+To use this feature, add a dependency to this artifact to the Essentials 
module of a Hippo project. After a (re)build it
+will show up in the Feature Library.
 
 This Poll Demo feature will only work correctly if the Poll feature is 
installed BEFORE this feature.
\ No newline at end of file



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/592743a2940b292f034e1bd25a36fe1127fea780

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/592743a2940b292f034e1bd25a36fe1127fea780
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-plugin-poll][feature/HIPPLUG-1481] HIPPLUG-1481 remove the demo files, except the new README

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / 
hippo-plugin-poll


Commits:
d915e268 by Jeroen Hoffman at 2017-10-20T10:19:07+02:00
HIPPLUG-1481 remove the demo files, except the new README

- - - - -


30 changed files:

- − demo/_demo_creation/README.txt
- − demo/_demo_creation/components/CustomPollDocumentComponent.java
- − demo/_demo_creation/components/CustomPollDocumentComponentInfo.java
- − demo/_demo_creation/import/content-custom-example-poll.xml
- − demo/_demo_creation/import/custompoll-catalogitem.xml
- − demo/_demo_creation/import/custompoll-page.xml
- − demo/_demo_creation/import/custompoll-sitemapitem.xml
- − demo/_demo_creation/import/custompoll-template.xml
- − demo/_demo_creation/import/custompoll-workspace-container.xml
- − demo/_demo_creation/webfiles/custompoll.component.ftl
- − demo/bootstrap/configuration/pom.xml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/modules/autoexport-module.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-poll-document.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-poll-folder.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-resource-bundle.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-untranslated-folder.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/default/catalog.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/abstractpages.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/abstractpages/base.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/catalog.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/components.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages/custompoll.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages/homepage.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages/pagenotfound.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/prototypepages.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/sitemap.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/sitemenus.yaml
- − 
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/templates.yaml


The diff was not included because it is too large.


View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/d915e2689c8f12588fd9836510da42d711b06960

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/d915e2689c8f12588fd9836510da42d711b06960
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-plugin-poll][feature/HIPPLUG-1481] HIPPLUG-1481 temp rename back (back to lowercase 'custom')

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / 
hippo-plugin-poll


Commits:
17bf49f1 by Jeroen Hoffman at 2017-10-20T10:17:04+02:00
HIPPLUG-1481 temp rename back (back to lowercase custom)

- - - - -


1 changed file:

- 
essentials-demo-feature/src/main/resources/xml/namespace-myCustomPollDocument.xml
 → 
essentials-demo-feature/src/main/resources/xml/namespace-customPollDocument.xml


Changes:

=
essentials-demo-feature/src/main/resources/xml/namespace-myCustomPollDocument.xml
 → 
essentials-demo-feature/src/main/resources/xml/namespace-customPollDocument.xml
=



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/17bf49f1715493d2c1122cae5cbbaeeed696140d

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/17bf49f1715493d2c1122cae5cbbaeeed696140d
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-plugin-poll][feature/HIPPLUG-1481] HIPPLUG-1481 temp rename (camelCase file issue)

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / 
hippo-plugin-poll


Commits:
736a0004 by Jeroen Hoffman at 2017-10-20T10:15:25+02:00
HIPPLUG-1481 temp rename (camelCase file  issue)

- - - - -


1 changed file:

- 
essentials-demo-feature/src/main/resources/xml/namespace-CustomPollDocument.xml 
→ 
essentials-demo-feature/src/main/resources/xml/namespace-myCustomPollDocument.xml


Changes:

=
essentials-demo-feature/src/main/resources/xml/namespace-CustomPollDocument.xml 
→ 
essentials-demo-feature/src/main/resources/xml/namespace-myCustomPollDocument.xml
=



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/736a0004dda3a8e2f5659eeb548b2bbdb7d4a453

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/736a0004dda3a8e2f5659eeb548b2bbdb7d4a453
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-plugin-poll][feature/HIPPLUG-1481] 6 commits: HIPPLUG-1482 Update demo project parent POM version

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / 
hippo-plugin-poll


Commits:
6ddded00 by Tobias Jeger at 2017-08-15T16:49:39+02:00
HIPPLUG-1482 Update demo project parent POM version

- - - - -
a5b40409 by Arent-Jan Banck at 2017-08-24T16:12:52+02:00
HIPPLUG-1474 prepare for 12.1 development and set project version to 
4.1.0-SNAPSHOT

- - - - -
b97e1d2d by Arent-Jan Banck at 2017-08-30T12:22:45+02:00
HIPPLUG-1485 Bump taglibs version
- - - - -
9e6a2a6b by Arent-Jan Banck at 2017-10-05T16:24:26+02:00
HIPPLUG-1494 Update parent project to version 29.3-SNAPSHOT

- - - - -
36c09b23 by Tobias Jeger at 2017-10-11T15:26:47+02:00
HIPPLUG-1497 Update demo to use latest release, fix bootstrap warnings

(cherry picked from commit b848fd86c55e2ee9ed9966221a665972a2652ce9)

- - - - -
a66db3e4 by Jeroen Hoffman at 2017-10-18T12:02:04+02:00
HIPPLUG-1481 Merge branch master into feature/HIPPLUG-1481

- - - - -


7 changed files:

- addon-cms/pom.xml
- addon-repository/pom.xml
- demo/bootstrap/configuration/src/main/resources/hcm-config/hst/hosts.yaml
- demo/bootstrap/configuration/src/main/resources/hcm-config/hst/sites.yaml
- demo/pom.xml
- hst-client/pom.xml
- pom.xml


Changes:

=
addon-cms/pom.xml
=
--- a/addon-cms/pom.xml
+++ b/addon-cms/pom.xml
@@ -19,7 +19,7 @@
   
 org.onehippo.cms7
 hippo-plugin-poll
-4.0.1-SNAPSHOT
+4.1.0-SNAPSHOT
   
 
   hippo-plugin-poll-addon-cms


=
addon-repository/pom.xml
=
--- a/addon-repository/pom.xml
+++ b/addon-repository/pom.xml
@@ -19,7 +19,7 @@
   
 org.onehippo.cms7
 hippo-plugin-poll
-4.0.1-SNAPSHOT
+4.1.0-SNAPSHOT
   
 
   hippo-plugin-poll-addon-repository


=
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/hosts.yaml
=
--- a/demo/bootstrap/configuration/src/main/resources/hcm-config/hst/hosts.yaml
+++ b/demo/bootstrap/configuration/src/main/resources/hcm-config/hst/hosts.yaml
@@ -1,15 +1,12 @@
 definitions:
   config:
-/hst:hst/hst:hosts:
-  jcr:primaryType: hst:virtualhosts
-  hst:defaultcontextpath: /site
-  /dev-localhost:
-jcr:primaryType: hst:virtualhostgroup
-hst:cmslocation: http://localhost:8080/cms
-hst:defaultport: 8080
-/localhost:
-  jcr:primaryType: hst:virtualhost
-  /hst:root:
-jcr:primaryType: hst:mount
-hst:homepage: root
-hst:mountpoint: /hst:hst/hst:sites/polldemo
+/hst:hst/hst:hosts/dev-localhost:
+  jcr:primaryType: hst:virtualhostgroup
+  hst:cmslocation: http://localhost:8080/cms
+  hst:defaultport: 8080
+  /localhost:
+jcr:primaryType: hst:virtualhost
+/hst:root:
+  jcr:primaryType: hst:mount
+  hst:homepage: root
+  hst:mountpoint: /hst:hst/hst:sites/polldemo


=
demo/bootstrap/configuration/src/main/resources/hcm-config/hst/sites.yaml
=
--- a/demo/bootstrap/configuration/src/main/resources/hcm-config/hst/sites.yaml
+++ b/demo/bootstrap/configuration/src/main/resources/hcm-config/hst/sites.yaml
@@ -1,7 +1,5 @@
 definitions:
   config:
-/hst:hst/hst:sites:
-  jcr:primaryType: hst:sites
-  /polldemo:
-jcr:primaryType: hst:site
-hst:content: /content/documents/polldemo
+/hst:hst/hst:sites/polldemo:
+  jcr:primaryType: hst:site
+  hst:content: /content/documents/polldemo


=
demo/pom.xml
=
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -5,7 +5,7 @@
   
 org.onehippo.cms7
 hippo-cms7-release
-12.0.0-SNAPSHOT
+12.1.0-SNAPSHOT
   
 
   Hippo Plugin Poll Demo
@@ -65,8 +65,8 @@
 
 4.0.0-SNAPSHOT
 2.2
-1.2.1
-2.7.1
+1.2.5
+2.7.2
 4.10
 3.1
  


=
hst-client/pom.xml
=
--- a/hst-client/pom.xml
+++ b/hst-client/pom.xml
@@ -19,7 +19,7 @@
   
 org.onehippo.cms7
 hippo-plugin-poll
-4.0.1-SNAPSHOT
+4.1.0-SNAPSHOT
   
 
   hippo-plugin-poll-hst-client


=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -21,13 +21,13 @@
   
 org.onehippo.cms7
 hippo-cms7-project
-29
+29.3-SNAPSHOT
   
 
   Hippo Plugin Poll
   Hippo Plugin Poll
   hippo-plugin-poll
-  4.0.1-SNAPSHOT
+  4.1.0-SNAPSHOT
   pom
 
   2009
@@ -42,10 +42,10 @@
 
 Hippo Plugin Poll
 
-5.0.0
-5.0.0
-5.0.0
-4.0.0
+5.1.0-SNAPSHOT
+5.1.0-SNAPSHOT
+5.1.0-SNAPSHOT
+4.1.0-SNAPSHOT
   
 
   



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/compare/223557d0d4c21825066176f85acafa889584aa79

[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/11.2] CMS-10895 bump CMS version to 4.2.6-SNAPSHOT

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/11.2 at cms-community / 
hippo-cms-release


Commits:
f5be3bf1 by Jeroen Hoffman at 2017-10-17T10:18:02+02:00
CMS-10895 bump CMS version to 4.2.6-SNAPSHOT

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 
4.2.2
 
3.2.1
 3.2.0
-4.2.5
+4.2.6-SNAPSHOT
 3.2.0
 3.2.0
 4.2.5-SNAPSHOT



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/f5be3bf1711f1e46f00d9e8af28b9a7d0706d0a5
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/REPO-1822] REPO-1822 in URI encoding, treat quote-like characters as quote, so remove them,…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/REPO-1822 at cms-community / 
hippo-repository


Commits:
cfbff022 by Jeroen Hoffman at 2017-09-21T09:48:19+02:00
REPO-1822 in URI encoding, treat quote-like characters as quote, so remove 
them, because quotes cannot be used in JCR node names

- - - - -


2 changed files:

- api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java
- api/src/test/java/org/hippoecm/repository/api/UriEncodingTest.java


Changes:

=
api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java
=
--- a/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java
+++ b/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java
@@ -525,14 +525,14 @@ public class StringCodecFactory {
 case 0x2015: sb.append("-");break; // ―
 case 0x2016: sb.append("-");break; // ‖
 case 0x2017: sb.append("-");break; // ‗
-case 0x2018: sb.append("'");break; // ‘ (left 
single quotation)
-case 0x2019: sb.append("'");break; // ’ (right 
single quotation)
-case 0x201a: sb.append("'");break; // ‚
-case 0x201b: sb.append("'");break; // ‛
-case 0x201c: sb.append("'");break; // “
-case 0x201d: sb.append("'");break; // ”
-case 0x201e: sb.append("'");break; // „
-case 0x201f: sb.append("'");break; // ‟
+case 0x2018: break; // ‘ (left single quotation) treat 
quote-like characters as quote: remove
+case 0x2019: break; // ’ (right single quotation)
+case 0x201a: break; // ‚
+case 0x201b: break; // ‛
+case 0x201c: break; // “
+case 0x201d: break; // ”
+case 0x201e: break; // „
+case 0x201f: break; // ‟
 
 // 0xac00 - 0xd7a3 : Hangul Syllables (only some of 
them are encoded)
 case 0xc2a0:


=
api/src/test/java/org/hippoecm/repository/api/UriEncodingTest.java
=
--- a/api/src/test/java/org/hippoecm/repository/api/UriEncodingTest.java
+++ b/api/src/test/java/org/hippoecm/repository/api/UriEncodingTest.java
@@ -78,7 +78,7 @@ public class UriEncodingTest {
   
uri.encode("ĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħĨĩĪīĬĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀŁłŃńŅņŇňʼnŊŋŌōŎŏŐőŒœŔŕŖŗŘřŚśŜŝŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſ"));
 
 // 0x201x subrange of Unicode General Punctuation
-assertEquals("", uri.encode("‐‑‒–—―‖‗‘’‚‛“”„‟"));
+assertEquals("with-ending", 
uri.encode("‐‑‒–—―‖‗‘’‚‛“”„‟with-ending"));
 
 // trailing dots
 assertEquals("abc", uri.encode("abc."));



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

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/cfbff0229ca953c3462508aaa99b22b078aae4f5
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] Pushed new branch feature/REPO-1822

[Jeroen Hoffman]

Jeroen Hoffman pushed new branch feature/REPO-1822 at cms-community / 
hippo-repository

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/tree/feature/REPO-1822
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-cms][release/5.0] CMS-10891 [Back port CMS 10836 to 12.0] new constructor that accepts context and…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/5.0 at cms-community / hippo-cms


Commits:
b2230ad5 by Jeroen Hoffman at 2017-09-14T15:49:44+02:00
CMS-10891 [Back port CMS 10836 to 12.0] new constructor that accepts context 
and config for crop dialog

(cherry picked from commit 9f1766134b57aace9248188ba928b6319c13bacf)

- - - - -


2 changed files:

- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropPlugin.java


Changes:

=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
=
--- 
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
+++ 
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2011-2016 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.
@@ -49,6 +49,8 @@ import org.apache.wicket.util.value.ValueMap;
 import org.hippoecm.frontend.dialog.Dialog;
 import org.hippoecm.frontend.editor.plugins.resource.ResourceHelper;
 import org.hippoecm.frontend.model.JcrNodeModel;
+import org.hippoecm.frontend.plugin.IPluginContext;
+import org.hippoecm.frontend.plugin.config.IPluginConfig;
 import org.hippoecm.frontend.plugins.gallery.editor.crop.ImageCropBehavior;
 import org.hippoecm.frontend.plugins.gallery.editor.crop.ImageCropSettings;
 import org.hippoecm.frontend.plugins.gallery.imageutil.ImageUtils;
@@ -91,10 +93,25 @@ public class ImageCropEditorDialog extends Dialog {
 private Dimension thumbnailDimension;
 private float compressionQuality;
 private final ImageCropSettings cropSettings;
+@SuppressWarnings("unused")
+private IPluginConfig config;
+@SuppressWarnings("unused")
+private IPluginContext context;
 
-public ImageCropEditorDialog(IModel jcrImageNodeModel, 
GalleryProcessor galleryProcessor) {
+/**
+ * A dialog to crop an image variant.
+ *
+ * @param jcrImageNodeModel node where the variant to be cropped is stored.
+ * @param galleryProcessor with configuration for scaling parameters and 
dimensions.
+ * @param config Config of the instantiating Plugin.
+ * @param context Context of the instantiating Plugin.
+ */
+public ImageCropEditorDialog(final IModel jcrImageNodeModel, final 
GalleryProcessor galleryProcessor, final IPluginConfig config, final 
IPluginContext context) {
 super(jcrImageNodeModel);
 
+this.config = config;
+this.context = context;
+
 setSize(DIALOG_SIZE);
 setTitleKey(DIALOG_TITLE);
 
@@ -202,6 +219,15 @@ public class ImageCropEditorDialog extends Dialog {
 } catch (RepositoryException e) {
 log.info("Cannot retrieve compression quality.", e);
 }
+
+}
+
+/**
+ * @deprecated use {@link ImageCropEditorDialog(IModel, GalleryProcessor, 
IPluginConfig, IPluginContext)} instead.
+ */
+@Deprecated
+public ImageCropEditorDialog(IModel jcrImageNodeModel, 
GalleryProcessor galleryProcessor) {
+this(jcrImageNodeModel, galleryProcessor, null, null);
 }
 
 /**


=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropPlugin.java
=
--- 
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropPlugin.java
+++ 
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropPlugin.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2011-2016 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.
@@ -47,7 +47,7 @@ public class ImageCropPlugin extends RenderPlugin {
 
 private static final long serialVersionUID = 1L;
 
-static final Logger log = LoggerFactory.getLogger(ImageCropPlugin.class);
+private static final Logger log = 
LoggerFactory.getLogger(ImageCropPlugin.class);
 
 private static final CssResourceReference CROP_SKIN = new 
CssResourceReference(ImageCropPlugin.class, "crop-plugin.css");
 
@@ -110,7 +110,7 @@ public class ImageCropPlugin extends RenderPlugin {
 @Override
 protected void onEvent(final AjaxRequestTarget target) {
 IDialogService dialogService = 
context.getService(IDialogService.class.getName(), IDialogService.class);
-dia

[HippoCMS-scm] [Git][cms-community/hippo-cms][release/4.2] CMS-10892 (back port CMS 10836 to 11.2) new constructor that accepts context and…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/4.2 at cms-community / hippo-cms


Commits:
964df615 by Jeroen Hoffman at 2017-09-06T10:34:52+02:00
CMS-10892 (back port CMS 10836 to 11.2) new constructor that accepts context 
and config for crop dialog

(cherry picked from commit 9f1766134b57aace9248188ba928b6319c13bacf)

- - - - -


2 changed files:

- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropPlugin.java


Changes:

=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
=
--- 
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
+++ 
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2011-2016 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.
@@ -49,6 +49,8 @@ import org.apache.wicket.util.value.ValueMap;
 import org.hippoecm.frontend.dialog.Dialog;
 import org.hippoecm.frontend.editor.plugins.resource.ResourceHelper;
 import org.hippoecm.frontend.model.JcrNodeModel;
+import org.hippoecm.frontend.plugin.IPluginContext;
+import org.hippoecm.frontend.plugin.config.IPluginConfig;
 import org.hippoecm.frontend.plugins.gallery.editor.crop.ImageCropBehavior;
 import org.hippoecm.frontend.plugins.gallery.editor.crop.ImageCropSettings;
 import org.hippoecm.frontend.plugins.gallery.imageutil.ImageUtils;
@@ -91,10 +93,25 @@ public class ImageCropEditorDialog extends Dialog {
 private Dimension thumbnailDimension;
 private float compressionQuality;
 private final ImageCropSettings cropSettings;
+@SuppressWarnings("unused")
+private IPluginConfig config;
+@SuppressWarnings("unused")
+private IPluginContext context;
 
-public ImageCropEditorDialog(IModel jcrImageNodeModel, 
GalleryProcessor galleryProcessor) {
+/**
+ * A dialog to crop an image variant.
+ *
+ * @param jcrImageNodeModel node where the variant to be cropped is stored.
+ * @param galleryProcessor with configuration for scaling parameters and 
dimensions.
+ * @param config Config of the instantiating Plugin.
+ * @param context Context of the instantiating Plugin.
+ */
+public ImageCropEditorDialog(final IModel jcrImageNodeModel, final 
GalleryProcessor galleryProcessor, final IPluginConfig config, final 
IPluginContext context) {
 super(jcrImageNodeModel);
 
+this.config = config;
+this.context = context;
+
 setSize(DIALOG_SIZE);
 setTitleKey(DIALOG_TITLE);
 
@@ -202,6 +219,15 @@ public class ImageCropEditorDialog extends Dialog {
 } catch (RepositoryException e) {
 log.info("Cannot retrieve compression quality.", e);
 }
+
+}
+
+/**
+ * @deprecated use {@link ImageCropEditorDialog(IModel, GalleryProcessor, 
IPluginConfig, IPluginContext)} instead.
+ */
+@Deprecated
+public ImageCropEditorDialog(IModel jcrImageNodeModel, 
GalleryProcessor galleryProcessor) {
+this(jcrImageNodeModel, galleryProcessor, null, null);
 }
 
 /**


=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropPlugin.java
=
--- 
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropPlugin.java
+++ 
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropPlugin.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2011-2016 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.
@@ -47,7 +47,7 @@ public class ImageCropPlugin extends RenderPlugin {
 
 private static final long serialVersionUID = 1L;
 
-static final Logger log = LoggerFactory.getLogger(ImageCropPlugin.class);
+private static final Logger log = 
LoggerFactory.getLogger(ImageCropPlugin.class);
 
 private static final CssResourceReference CROP_SKIN = new 
CssResourceReference(ImageCropPlugin.class, "crop-plugin.css");
 
@@ -110,7 +110,7 @@ public class ImageCropPlugin extends RenderPlugin {
 @Override
 protected void onEvent(final AjaxRequestTarget target) {
 IDialogService dialogService = 
context.getService(IDialogService.class.getName(), IDialogService.class);
-dia

[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/CMS-10784

[Jeroen Hoffman]

Jeroen Hoffman deleted branch feature/CMS-10784 at cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 6 commits: CMS-10784 show an info message that warns about the checked-in state

[Jeroen Hoffman]

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


Commits:
1dc4b956 by Bert Leunis at 2017-06-09T16:47:42+02:00
CMS-10784 show an info message that warns about the checked-in state

- - - - -
fb53bb83 by Bert Leunis at 2017-07-10T11:55:48+02:00
CMS-10784 Merge master changes in feature/CMS-10784

- - - - -
7320e8dd by Jeroen Hoffman at 2017-07-11T14:49:31+02:00
CMS-10784 Merge branch master into feature/CMS-10784

- - - - -
03f24387 by Bert Leunis at 2017-07-11T16:52:34+02:00
CMS-10784 disable editor for checked in nodes. message in properties file.

- - - - -
97089651 by Jeroen Hoffman at 2017-07-13T11:46:49+02:00
Merge remote-tracking branch origin/feature/CMS-10784 into 
feature/CMS-10784

- - - - -
40399ed1 by Jeroen Hoffman at 2017-07-13T12:04:50+02:00
CMS-10784 Reintegrate branch feature/CMS-10784 into master

- - - - -


5 changed files:

- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.java
- + 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.properties
- 
console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/console.css
- + 
console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/dialog-information-16.png


Changes:

=
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html
=
--- 
a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html
+++ 
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html
@@ -15,6 +15,7 @@
 -->
 http://wicket.apache.org/;>
 
+  [message]
   
 [UUID]
 


=
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.java
=
--- 
a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.java
+++ 
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2014 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-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.
@@ -20,6 +20,7 @@ import javax.jcr.RepositoryException;
 
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.model.IModel;
 import org.hippoecm.frontend.plugin.IPluginContext;
 import org.hippoecm.frontend.plugin.config.IPluginConfig;
@@ -30,13 +31,19 @@ public class EditorPlugin extends RenderPlugin {
 private static final long serialVersionUID = 1L;
 
 private final NodeEditor editor;
+private Label message;
 
 public EditorPlugin(IPluginContext context, IPluginConfig config) {
 super(context, config);
 
+message = new Label("message", getString("node.checked.in.info"));
+add(message);
+
 editor = new NodeEditor("editor", getModel());
 add(editor);
 add(new ToggleBehavior());
+
+onModelChanged();
 }
 
 protected IPluginContext getPluginContext() {
@@ -55,6 +62,8 @@ public class EditorPlugin extends RenderPlugin {
 } else {
 add(new AttributeModifier("style", 
"background-color:#ddd;"));
 }
+message.setVisible(!node.isCheckedOut());
+editor.setEnabled(node.isCheckedOut());
 redraw();
 }
 


=
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.properties
=
--- /dev/null
+++ 
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.properties
@@ -0,0 +1 @@
+node.checked.in.info=This node is checked in. You must check it out before you 
can edit it. 
\ No newline at end of file


=
console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/console.css
=
--- 
a/console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/console.css
+++ 
b/console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/console.css
@@ -549,6 +549,16 @@ li.hippo-console-menu-actions-save.session-changes a {
   padding: 20px;
 }
 
+.hippo-console-editor .panel-message {
+  background-image: url("dialog-information-16.png");
+  background-repeat: no-repeat;
+  background-position: 10px 10px;
+  background-color: #fff8d5;
+  padding: 10px 10px 1

[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/CMS-10782

[Jeroen Hoffman]

Jeroen Hoffman deleted branch feature/CMS-10782 at cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 4 commits: CMS-10782 filter auto suggest entries case insensitive

[Jeroen Hoffman]

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


Commits:
7c4e64c1 by Bert Leunis at 2017-06-09T10:18:15+02:00
CMS-10782 filter auto suggest entries case insensitive

- - - - -
456696ec by Bert Leunis at 2017-07-10T11:46:27+02:00
CMS-10782 Merge master changes in feature/CMS-10782

- - - - -
1272ac00 by Jeroen Hoffman at 2017-07-11T15:15:03+02:00
CMS-10782 Merge branch master into feature/CMS-10782

- - - - -
35cdfe22 by Jeroen Hoffman at 2017-07-11T15:33:44+02:00
CMS-10782 Reintegrate branch feature/CMS-10782

- - - - -


2 changed files:

- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/node/NodeDialog.java
- 
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/property/PropertyDialog.java


Changes:

=
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/node/NodeDialog.java
=
--- 
a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/node/NodeDialog.java
+++ 
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/node/NodeDialog.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2015 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-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.
@@ -148,7 +148,7 @@ public class NodeDialog extends AbstractDialog {
 }
 Iterator resultIter = result.iterator();
 while (resultIter.hasNext()) {
-if (!resultIter.next().contains(input)) {
+if 
(!resultIter.next().toLowerCase().contains(input.toLowerCase())) {
 resultIter.remove();
 }
 }
@@ -207,7 +207,7 @@ public class NodeDialog extends AbstractDialog {
 }
 else {
 for (String nodeName : namesToTypes.keySet()) {
-if (!nodeName.equals("*") && nodeName.contains(input)) 
{
+if (!nodeName.equals("*") && 
nodeName.toLowerCase().contains(input.toLowerCase())) {
 result.add(nodeName);
 }
 }


=
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/property/PropertyDialog.java
=
--- 
a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/property/PropertyDialog.java
+++ 
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/property/PropertyDialog.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-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.
@@ -316,7 +316,7 @@ public class PropertyDialog extends AbstractDialog {
 protected Iterator getChoices(String input) {
 List result = new ArrayList<>();
 for (String propName : choiceModel.getObject().keySet()) {
-if (propName.contains(input)) {
+if (propName.toLowerCase().contains(input.toLowerCase())) {
 result.add(propName);
 }
 }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/0b85d94dc15f31b5c1cb8bcb12347ff6187e8db7...35cdfe224f0aaf7269805b884c4d3f2fd9069de5
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-essentials-components] Pushed new branch bugfix/ESSCOM-21

[Jeroen Hoffman]

Jeroen Hoffman pushed new branch bugfix/ESSCOM-21 at cms-community / 
hippo-essentials-components
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10060

[Jeroen Hoffman]

Jeroen Hoffman pushed new branch bugfix/CMS-10060 at cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-repository][release/4.2] REPO-1696 [back port to 11.2] avoid NPE in ServicingSearchIndex#updateNodes by s…

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/4.2 at cms-community / hippo-repository


Commits:
d1feeb7a by Jeroen Hoffman at 2017-06-12T14:29:24+02:00
REPO-1696 [back port to 11.2] avoid NPE in ServicingSearchIndex#updateNodes by 
simple null checks after .next() calls

(cherry picked from commit 7c073da17cab6477e57e97bc3dbaf5ff5ff87be6)

- - - - -


1 changed file:

- 
engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingSearchIndex.java


Changes:

=
engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingSearchIndex.java
=
--- 
a/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingSearchIndex.java
+++ 
b/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingSearchIndex.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-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.
@@ -404,15 +404,20 @@ public class ServicingSearchIndex extends SearchIndex 
implements HippoQueryHandl
 
 final Set augmentedRemove = new HashSet<>();
 while (remove.hasNext()) {
-augmentedRemove.add(remove.next());
+final NodeId nodeId = remove.next();
+if (nodeId != null) {
+augmentedRemove.add(nodeId);
+}
 }
 
 // NodeState does not implement equals hence we need NodeId
 final Map<NodeId, NodeState> augmentedAdd = new HashMap<>();
 while (add.hasNext()) {
 final NodeState nodeState = add.next();
-// since NodeState does not have hashcode/equals impls, we need to 
use NodeId for equals in Map
-augmentedAdd.put(nodeState.getNodeId(), nodeState);
+if (nodeState != null) {
+// since NodeState does not have hashcode/equals impls, we 
need to use NodeId for equals in Map
+augmentedAdd.put(nodeState.getNodeId(), nodeState);
+}
 }
 
 
appendDocumentsThatHaveChangedChildNodesOrChangedHandles(augmentedRemove, 
augmentedAdd);



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/d1feeb7a86c34ba4edc23a243029c796d30201cb
___
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-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-repository] Pushed new branch bugfix/REPO-1695

[Jeroen Hoffman]

Jeroen Hoffman pushed new branch bugfix/REPO-1695 at cms-community / 
hippo-repository
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10553] CMS-10553 non-functional: add 'final' keyword to constant

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/CMS-10553 at cms-community / hippo-cms


Commits:
0161d046 by Jeroen Hoffman at 2017-05-23T11:50:34+02:00
CMS-10553 non-functional: add final keyword to constant

- - - - -


1 changed file:

- 
api/src/main/java/org/hippoecm/frontend/plugins/standards/tree/FolderTreeNode.java


Changes:

=
api/src/main/java/org/hippoecm/frontend/plugins/standards/tree/FolderTreeNode.java
=
--- 
a/api/src/main/java/org/hippoecm/frontend/plugins/standards/tree/FolderTreeNode.java
+++ 
b/api/src/main/java/org/hippoecm/frontend/plugins/standards/tree/FolderTreeNode.java
@@ -42,7 +42,7 @@ public class FolderTreeNode extends JcrTreeNode {
 /**
  * Comparator by folder display name.
  */
-private static Comparator DISPLAY_NAME_COMPARATOR = new 
JcrTreeNameComparator();
+private static final Comparator DISPLAY_NAME_COMPARATOR = 
new JcrTreeNameComparator();
 
 /**
  * Returns {@link #DISPLAY_NAME_COMPARATOR} if the current folder node is 
of {@link HippoStdNodeType#NT_DIRECTORY}



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/0161d04628bb17723f557b8e5be2165762bb193f
___
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-10553] CMS-10553 non-functional: remove serialVersionUID

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/CMS-10553 at cms-community / hippo-cms


Commits:
ef04bdbe by Jeroen Hoffman at 2017-05-23T11:40:25+02:00
CMS-10553 non-functional: remove serialVersionUID

- - - - -


1 changed file:

- api/src/main/java/org/hippoecm/frontend/model/tree/JcrTreeNode.java


Changes:

=
api/src/main/java/org/hippoecm/frontend/model/tree/JcrTreeNode.java
=
--- a/api/src/main/java/org/hippoecm/frontend/model/tree/JcrTreeNode.java
+++ b/api/src/main/java/org/hippoecm/frontend/model/tree/JcrTreeNode.java
@@ -38,7 +38,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class JcrTreeNode extends NodeModelWrapper implements 
IJcrTreeNode {
-private static final long serialVersionUID = 1L;
 
 static final Logger log = LoggerFactory.getLogger(JcrTreeNode.class);
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/ef04bdbe81740e8b2c66dca5ef38f92b060e2da1
___
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-10553] 32 commits: CMS-10143 make the area with new field options a bit less high

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch feature/CMS-10553 at cms-community / hippo-cms


Commits:
726a30f8 by Bert Leunis at 2017-05-15T10:57:39+02:00
CMS-10143 make the area with new field options a bit less high

- - - - -
070b232f by Bert Leunis at 2017-05-15T13:04:14+02:00
CMS-10411 reorder system info; removed GC button

- - - - -
2db0e6aa by Bert Leunis at 2017-05-15T15:46:54+02:00
CMS-10420 use label instead of span

- - - - -
bad7d669 by Bert Leunis at 2017-05-15T16:02:06+02:00
CMS-10420 three more occurences of a checkbox with a clickable label

- - - - -
5142f3e3 by Bert Leunis at 2017-05-16T10:17:15+02:00
CMS-10646 do not use namespace in field name nor caption

- - - - -
7ab0e7f0 by Bert Leunis at 2017-05-18T11:29:16+02:00
Merge branch master into feature/CMS-10646

- - - - -
92fb082e by Bert Leunis at 2017-05-18T11:31:45+02:00
CMS-10646 strip path property for non-primitives

- - - - -
098fb02f by Arthur Bogaart at 2017-05-18T22:58:33+02:00
CMS-10656 Code cleanup

- - - - -
a9593ddb by Jeroen Hoffman at 2017-05-19T11:50:16+02:00
CMS-10420 Merge branch master into feature/CMS-10420

- - - - -
623749cb by Jeroen Hoffman at 2017-05-19T11:51:43+02:00
CMS-10420 Reintegrate branch feature/CMS-10420

- - - - -
12a17802 by Jeroen Hoffman at 2017-05-19T12:14:48+02:00
CMS-10143 Merge branch master into feature/CMS-10143

- - - - -
dc5a1188 by Jeroen Hoffman at 2017-05-19T12:17:29+02:00
CMS-10143 Reintegrate branch feature/CMS-10143

- - - - -
b5aebac9 by Jeroen Hoffman at 2017-05-19T13:36:06+02:00
CMS-10411 add View before the system info hint, to be more in line 
with the other hints

- - - - -
afe3da4f by Jeroen Hoffman at 2017-05-19T14:00:49+02:00
CMS-10411 remove serialVersionUID

- - - - -
3bda18d3 by Jeroen Hoffman at 2017-05-19T14:05:55+02:00
CMS-10411 uncapitalize Version twice, to be in line with the other 
4 occurences

- - - - -
fd106b39 by Jeroen Hoffman at 2017-05-19T14:24:56+02:00
CMS-10411 Merge branch master into feature/CMS-10411

- - - - -
53db1397 by Jeroen Hoffman at 2017-05-19T14:26:38+02:00
CMS-10411 Reintegrate branch feature/CMS-10411

- - - - -
b9d5c66f by Joeri de Gooijer at 2017-05-19T14:36:39+02:00
CMS-10750 Add all files for blueimp fileupload

- - - - -
a7ebbea4 by Arthur Bogaart at 2017-05-19T15:21:43+02:00
CMS-10656 Replace BrowsableModel with preview-links-service

Instead of editing the HTML of the previewdiff view on the server
(regular expressions..) to insert click handlers for internal links,
use a client-side script that registers onlick handlers (using jQuery)
and triggers a callback using the data-uuid attribute value.

- - - - -
a53268fa by Arthur Bogaart at 2017-05-19T15:23:18+02:00
CMS-10656 Update the styling of diff-changed blocks

Changed blocks get a light blue background color and no more
underline gif

- - - - -
6db5af7d by Jeroen Hoffman at 2017-05-19T15:45:01+02:00
CMS-10646 Merge branch master into feature/CMS-10646

- - - - -
dad0d334 by Jeroen Hoffman at 2017-05-22T09:28:05+02:00
CMS-10646 use StringUtils.substringAfter the both occasions with the same logic

- - - - -
6b1c9be7 by Jeroen Hoffman at 2017-05-22T09:29:55+02:00
CMS-10646 remove serialVersionUIDs, no longer needed

- - - - -
8252b41c by Jeroen Hoffman at 2017-05-22T09:38:07+02:00
CMS-10646 Reintegrate branch feature/CMS-10646

- - - - -
ddae21f5 by Mathijs den Burger at 2017-05-22T10:44:32+02:00
CMS-10656 Add jslint plugin to richtext/frontend module

- - - - -
fe8683b1 by Mathijs den Burger at 2017-05-22T10:46:39+02:00
CMS-10656 Also log exception when node cannot be found, code cleanup

- - - - -
33300d22 by Mathijs den Burger at 2017-05-22T11:01:37+02:00
CMS-10656 Remove unused diff images and CSS classes

None of the removed images and CSS classes are used anywhere in
the CMS.

- - - - -
fd32471f by Mathijs den Burger at 2017-05-22T12:19:38+02:00
CMS-10656 Move diff CSS to SCSS

The AbstractRichTextDiffPanel only included the diff.css, so it
can be removed. Its sub-classes can now directly extend its
super class AbstractRichTextViewPanel.

- - - - -
acef9ea6 by Mathijs den Burger at 2017-05-22T12:44:11+02:00
CMS-10656 Use the same diff colors everywhere

Also moved the existing rules for compare/diff to _editor_diff.

The rules for .hippo-dif-added and .hippo-dif-removed were
dead code because of the typo (dif vs diff) and have been
removed.

- - - - -
03ec4cee by Mathijs den Burger at 2017-05-22T12:47:52+02:00
CMS-10656 Reintegrate bugfix/CMS-10656

- - - - -
53e6c331 by Jeroen Hoffman at 2017-05-23T10:03:24+02:00
CMS-10553 Merge branch master into feature/CMS-10553

- - - - -
f5c44096 by Jeroen Hoffman at 2017-05-23T10:13:01+02:00
CMS-10553 non-functional: remove serialVersionUIDs, update copyright years

- - - - -


30 changed files:

- api/Gruntfile.js
- api/src/main/java/org/hippoecm/frontend/model/SystemInfoDataProvider.java
- api/src/main/java/org/hippoecm/frontend/model/tree/JcrTreeNameComparator.java
- api/src/main/java/org/hippoecm/frontend/model/tree/JcrTreeNode.java
- api/src