[HippoCMS-scm] [Git][cms-community/hippo-testsuite][master] HSTTWO-3978 remove not working rebel log4j2-plugin configuration

[Ate Douma]

Ate Douma pushed to branch master at cms-community / hippo-testsuite


Commits:
b069041e by Ate Douma at 2017-04-24T20:27:49+02:00
HSTTWO-3978 remove not working rebel log4j2-plugin configuration

A more generic solution is adding attribute monitorInterval=5 on 
the log4j2 Configuration
element in conf/log4j2-dev.xml which is left to be decided by project 
developers themselves.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -243,7 +243,6 @@
   
 
   
file://${project.basedir}/conf/log4j2.xml
-  true
   ${solr.data.dir}
   ${project.basedir}
 



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

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][master] HSTTWO-3978 remove not working rebel log4j2-plugin configuration

[Ate Douma]

Ate Douma pushed to branch master at cms-community / hippo-site-toolkit


Commits:
d156c8f4 by Ate Douma at 2017-04-24T20:27:49+02:00
HSTTWO-3978 remove not working rebel log4j2-plugin configuration

A more generic solution is adding attribute monitorInterval=5 on 
the log4j2 Configuration
element in conf/log4j2-dev.xml which is left to be decided by project 
developers themselves.

- - - - -


1 changed file:

- integration/tests/pom.xml


Changes:

=
integration/tests/pom.xml
=
--- a/integration/tests/pom.xml
+++ b/integration/tests/pom.xml
@@ -206,7 +206,6 @@
   ${war.repo.path}
   
file:${project.basedir}/conf/repository.xml
   
file://${project.basedir}/conf/log4j2.xml
-  true
   localhost
 
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/d156c8f4134f18a94c4882255f94283feb36c450
___
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][master] HIPPLUG-1457 remove not working rebel log4j2-plugin configuration

[Ate Douma]

Ate Douma pushed to branch master at cms-community / hippo-plugin-taxonomy


Commits:
08d1b9cb by Ate Douma at 2017-04-24T20:26:49+02:00
HIPPLUG-1457 remove not working rebel log4j2-plugin configuration

A more generic solution is adding attribute monitorInterval=5 on 
the log4j2 Configuration
element in conf/log4j2-dev.xml which is left to be decided by project 
developers themselves.

- - - - -


1 changed file:

- demo/pom.xml


Changes:

=
demo/pom.xml
=
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -162,7 +162,6 @@
   
 
   
file://${project.basedir}/conf/log4j2-dev.xml
-  true
   ${project.basedir}
   true
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/08d1b9cbb019c349bcb5e8853d5f233411edab22
___
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] HIPPLUG-1457 remove not working rebel log4j2-plugin configuration

[Ate Douma]

Ate Douma pushed to branch master at cms-community / hippo-plugin-poll


Commits:
be137dbf by Ate Douma at 2017-04-24T20:26:49+02:00
HIPPLUG-1457 remove not working rebel log4j2-plugin configuration

A more generic solution is adding attribute monitorInterval=5 on 
the log4j2 Configuration
element in conf/log4j2-dev.xml which is left to be decided by project 
developers themselves.

- - - - -


1 changed file:

- demo/pom.xml


Changes:

=
demo/pom.xml
=
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -320,7 +320,6 @@
   
 
   
file://${project.basedir}/conf/log4j2-dev.xml
-  true
   
   ${project.basedir}
   
true



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

[HippoCMS-scm] [Git][cms-community/hippo-plugin-dashboard-document-wizard][master] HIPPLUG-1457 remove not working rebel log4j2-plugin configuration

[Ate Douma]

Ate Douma pushed to branch master at cms-community / 
hippo-plugin-dashboard-document-wizard


Commits:
c65d3a50 by Ate Douma at 2017-04-24T20:26:49+02:00
HIPPLUG-1457 remove not working rebel log4j2-plugin configuration

A more generic solution is adding attribute monitorInterval=5 on 
the log4j2 Configuration
element in conf/log4j2-dev.xml which is left to be decided by project 
developers themselves.

- - - - -


1 changed file:

- demo/pom.xml


Changes:

=
demo/pom.xml
=
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -156,7 +156,6 @@
   
 
   
file://${project.basedir}/conf/log4j2-dev.xml
-  true
   
   ${project.basedir}
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-dashboard-document-wizard/commit/c65d3a505293c466aab7e3ba290a5ab737cdea66
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-plugin-selections][master] HIPPLUG-1457 remove not working rebel log4j2-plugin configuration

[Ate Douma]

Ate Douma pushed to branch master at cms-community / hippo-plugin-selections


Commits:
3c3e2e59 by Ate Douma at 2017-04-24T20:26:49+02:00
HIPPLUG-1457 remove not working rebel log4j2-plugin configuration

A more generic solution is adding attribute monitorInterval=5 on 
the log4j2 Configuration
element in conf/log4j2-dev.xml which is left to be decided by project 
developers themselves.

- - - - -


1 changed file:

- demo/pom.xml


Changes:

=
demo/pom.xml
=
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -151,7 +151,6 @@
   
 
   
file://${project.basedir}/conf/log4j2-dev.xml
-  true
   
   ${project.basedir}
 



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

[HippoCMS-scm] [Git][cms-community/hippo-plugin-content-blocks][master] HIPPLUG-1457 remove not working rebel log4j2-plugin configuration

[Ate Douma]

Ate Douma pushed to branch master at cms-community / hippo-plugin-content-blocks


Commits:
2c15ad72 by Ate Douma at 2017-04-24T20:26:49+02:00
HIPPLUG-1457 remove not working rebel log4j2-plugin configuration

A more generic solution is adding attribute monitorInterval=5 on 
the log4j2 Configuration
element in conf/log4j2-dev.xml which is left to be decided by project 
developers themselves.

- - - - -


1 changed file:

- demo/pom.xml


Changes:

=
demo/pom.xml
=
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -139,7 +139,6 @@
   
 
   
file://${project.basedir}/conf/log4j2-dev.xml
-  true
   
   ${project.basedir}
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-content-blocks/commit/2c15ad7288ea83724b7dde38c094a416b22bfcaa
___
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] ARCHE-528 remove not working rebel log4j2-plugin configuration

[Ate Douma]

Ate Douma pushed to branch master at cms-community / hippo-project-archetype


Commits:
3aa834db by Ate Douma at 2017-04-24T20:24:42+02:00
ARCHE-528 remove not working rebel log4j2-plugin configuration

A more generic solution is adding attribute monitorInterval=5 on 
the log4j2 Configuration
element in conf/log4j2-dev.xml which is left to be decided by project 
developers themselves.

- - - - -


1 changed file:

- src/main/resources/archetype-resources/pom.xml


Changes:

=
src/main/resources/archetype-resources/pom.xml
=
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -293,7 +293,6 @@
   
 
   
file://${dollar}{project.basedir}/conf/log4j2-dev.xml
-  true
   
   ${project.basedir}
   
true



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

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp2-CHANNELMGR-1201

[Joeri de Gooijer]

Joeri de Gooijer pushed new branch feature/visual-editing-psp2-CHANNELMGR-1201 
at cms-community / hippo-addon-channel-manager
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/visual-editing-psp2

[Arthur Bogaart]

Arthur Bogaart deleted branch feature/visual-editing-psp2 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-9918 When using the search filter in the gallery (or image picker), I want to see thumbnails

[Arthur Bogaart]

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


Commits:
645d4b94 by Marijan Milicevic at 2017-03-21T15:21:11+01:00
CMS-9918 When using the search filter in the gallery (or image picker), I want 
to see thumbnails
- move classes from gallery plugin into cms API
- pass search scope to the SectionViewer plugin so we can detect when image 
search is done

- - - - -
64418232 by Arthur Bogaart at 2017-04-21T16:22:16+02:00
CMS-9918 Merge master changes in feature/CMS-9918

- - - - -
4bbe1702 by Arthur Bogaart at 2017-04-21T23:47:10+02:00
CMS-9918 Cleanup code

- formatting, add finals, remove serialVersionUID

- - - - -
367db240 by Arthur Bogaart at 2017-04-24T12:44:28+02:00
CMS-9918 Add ImageSearchViewPlugin

- Made queryCluster name configurable for TextSearchBuilder
- moved thumbnail related code from SearchViewPlugin to
ImageSearchViewPlugin
- added configuration for ImageSearchViewPlugin
- fixed undetached models in SearchingSectionPlugin

- - - - -
fb376df5 by Arthur Bogaart at 2017-04-24T16:56:04+02:00
CMS-9918 Bump hippo:version for cms-search-views

- - - - -
be0fd421 by Arthur Bogaart at 2017-04-24T16:59:18+02:00
CMS-9918 Reintegrate feature/CMS-9918

- - - - -


30 changed files:

- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.html
 → api/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.html
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.java
 → api/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/Translations.java
 → api/src/main/java/org/hippoecm/frontend/plugins/gallery/Translations.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/Translations.properties
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/Translations.properties
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/FallbackImageGalleryListColumnProvider.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/FallbackImageGalleryListColumnProvider.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/ImageGalleryColumnProviderPlugin.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/ImageGalleryColumnProviderPlugin.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/CalendarComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/CalendarComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/LongPropertyComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/LongPropertyComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/MimeTypeComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/MimeTypeComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/PropertyComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/PropertyComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/SizeComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/SizeComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/DatePropertyRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/DatePropertyRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/ImageIconRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/ImageIconRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/MimeTypeIconRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/MimeTypeIconRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/PropertyRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/PropertyRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/SizeRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/SizeRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/StringPropertyRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/StringPropertyRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/ThumbnailRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/ThumbnailRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-audio-16.png
 → 

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Pushed new branch bugfix/HSTTWO-3907

[Tobias Jeger]

Tobias Jeger pushed new branch bugfix/HSTTWO-3907 at cms-community / 
hippo-site-toolkit
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-9918] CMS-9918 Bump hippo:version for cms-search-views

[Arthur Bogaart]

Arthur Bogaart pushed to branch feature/CMS-9918 at cms-community / hippo-cms


Commits:
fb376df5 by Arthur Bogaart at 2017-04-24T16:56:04+02:00
CMS-9918 Bump hippo:version for cms-search-views

- - - - -


1 changed file:

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


Changes:

=
config/src/main/resources/hippoecm-extension.xml
=
--- a/config/src/main/resources/hippoecm-extension.xml
+++ b/config/src/main/resources/hippoecm-extension.xml
@@ -627,7 +627,7 @@
   true
 
 
-  2.27.00
+  5.0.0
 
   
   



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

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/wpm] CHANNELMGR-1240 Select Master Branch

[Michiel Rop]

Michiel Rop pushed to branch feature/wpm at cms-community / 
hippo-addon-channel-manager


Commits:
48e8cd07 by Michiel Rop at 2017-04-24T16:34:47+02:00
CHANNELMGR-1240 Select Master Branch

When the item with the name of the current channel is selected a call is
made to the HST MountService to select the master mount for that
channel.

- - - - -


2 changed files:

- frontend-ng/src/angularjs/channel/projectToggle/projectToggle.controller.js
- frontend-ng/src/angularjs/services/project.service.js


Changes:

=
frontend-ng/src/angularjs/channel/projectToggle/projectToggle.controller.js
=
--- 
a/frontend-ng/src/angularjs/channel/projectToggle/projectToggle.controller.js
+++ 
b/frontend-ng/src/angularjs/channel/projectToggle/projectToggle.controller.js
@@ -22,7 +22,6 @@ class ProjectToggleController {
 
 this.$translate = $translate;
 this.OverlayService = OverlayService;
-this.ChannelService = ChannelService;
 this.ProjectService = ProjectService;
 this.available = ProjectService.available;
 const channel = ChannelService.getChannel();
@@ -30,27 +29,25 @@ class ProjectToggleController {
 this.withBranch = [this.MASTER];
 this.selectedProject = this.MASTER;
 this._setProjects();
-this.available = false;
-  }
-  $OnInit() {
-this.available = this.ProjectService.available;
   }
   _setProjects() {
-this.ProjectService.projects(this.ChannelService.getChannel().id)
+this.ProjectService.projects()
   .then((response) => {
 this.withBranch = this.withBranch.concat(response.withBranch);
 this.withoutBranch = response.withoutBranch;
   });
   }
   projectChanged() {
-if (this.selectedProject.id === this.MASTER.id) return;
+if (this.selectedProject.id === this.MASTER.id) {
+  this.ProjectService.doSelectMaster();
+  return;
+}
 if (this.withBranch.indexOf(this.selectedProject) >= 0) {
   this.ProjectService.doSelectBranch(this.selectedProject);
 } else {
   this.ProjectService.doCreateBranch(this.selectedProject);
 }
   }
-
 }
 
 export default ProjectToggleController;


=
frontend-ng/src/angularjs/services/project.service.js
=
--- a/frontend-ng/src/angularjs/services/project.service.js
+++ b/frontend-ng/src/angularjs/services/project.service.js
@@ -29,8 +29,8 @@ class ProjectService {
 this.HstService = HstService;
   }
 
-  projects(id) {
-const url = 
`${this.ConfigService.getCmsContextPath()}${REST_API_PATH}/${id}/channel`;
+  projects() {
+const url = 
`${this.ConfigService.getCmsContextPath()}${REST_API_PATH}/${this.ChannelService.getChannel().mountId}/channel`;
 return this.$http({ method: 'GET', url, headers: {}, data: {} })
   .then(result => result.data);
   }
@@ -43,6 +43,10 @@ class ProjectService {
 this.HstService.doPost(project.id, 
this.ChannelService.getChannel().mountId, 'selectbranch');
   }
 
+  doSelectMaster() {
+this.HstService.doPost(null, this.ChannelService.getChannel().mountId, 
'selectmaster');
+  }
+
 }
 
 export default ProjectService;



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/48e8cd0771e983c46bb483118191a6525071fe43
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/wpm] HSTTWO-3979 Fix the unit test by fetcing a new channel object

[Ard Schrijvers]

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


Commits:
a6ba247b by Ard Schrijvers at 2017-04-24T16:10:37+02:00
HSTTWO-3979 Fix the unit test by fetcing a new channel object

- - - - -


1 changed file:

- 
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/MountResourceTest.java


Changes:

=
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/MountResourceTest.java
=
--- 
a/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/MountResourceTest.java
+++ 
b/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/MountResourceTest.java
@@ -144,7 +144,10 @@ public class MountResourceTest extends 
AbstractMountResourceTest {
 Thread.sleep(200);
 
 mockNewRequest(session, "localhost", "/home");
+// reload the preview channel : After changes, it *must* be a 
different object
+assertTrue("Since there are changes, pccs.getEditingPreviewChannel 
should return a new object.", previewChannel != 
pccs.getEditingPreviewChannel());
 
+previewChannel = pccs.getEditingPreviewChannel();
 changedBySet = previewChannel.getChangedBySet();
 assertTrue(changedBySet.contains("admin"));
 
@@ -157,6 +160,7 @@ public class MountResourceTest extends 
AbstractMountResourceTest {
 mockNewRequest(session, "localhost", "/home");
 
 // there should be no locks
+previewChannel = pccs.getEditingPreviewChannel();
 changedBySet = previewChannel.getChangedBySet();
 assertTrue(changedBySet.isEmpty());
 }



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

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/wpm] HSTTWO-3980 Create url for select master branch

[Michiel Rop]

Michiel Rop pushed to branch feature/wpm at cms-community / hippo-site-toolkit


Commits:
136bc763 by Michiel Rop at 2017-04-24T15:51:36+02:00
HSTTWO-3980 Create url for select master branch

- - - - -


1 changed file:

- 
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java


Changes:

=
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
=
--- 
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
+++ 
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
@@ -186,6 +186,14 @@ public class MountResource extends AbstractConfigResource {
 return ok("Branch selected successfully");
 }
 
+@POST
+@Path("/selectmaster")
+@Produces(MediaType.APPLICATION_JSON)
+public Response selectMaster(@QueryParam("mountId") final String mountId) {
+log.debug("Select master  of mount:{}", mountId);
+return ok("Master branch selected successfully");
+}
+
 @PUT
 @Path("/createbranch")
 @Produces(MediaType.APPLICATION_JSON)



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

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/wpm] HSTTWO-3980 Minor : Add final

[Ard Schrijvers]

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


Commits:
69891e98 by Ard Schrijvers at 2017-04-24T15:24:39+02:00
HSTTWO-3980 Minor : Add final

- - - - -


1 changed file:

- 
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java


Changes:

=
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
=
--- 
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
+++ 
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
@@ -181,7 +181,7 @@ public class MountResource extends AbstractConfigResource {
 @POST
 @Path("/selectbranch")
 @Produces(MediaType.APPLICATION_JSON)
-public Response selectBranch(@QueryParam("mountId") final String mountId, 
String branchId) {
+public Response selectBranch(@QueryParam("mountId") final String mountId, 
final String branchId) {
 log.debug("Select branch:{} of mount:{}", branchId, mountId);
 return ok("Branch selected successfully");
 }
@@ -189,7 +189,7 @@ public class MountResource extends AbstractConfigResource {
 @PUT
 @Path("/createbranch")
 @Produces(MediaType.APPLICATION_JSON)
-public Response createBranch(@QueryParam("mountId") final String mountId, 
String branchId) {
+public Response createBranch(@QueryParam("mountId") final String mountId, 
final String branchId) {
 log.debug("Create branch:{} from mount:{}", branchId, mountId);
 return ok("Branch created successfully");
 }



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

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/wpm] HSTTWO-3979 Account for all changes being made to hst:workspace from now on

[Ard Schrijvers]

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


Commits:
25c2fd07 by Ard Schrijvers at 2017-04-24T15:21:35+02:00
HSTTWO-3979 Account for all changes being made to hst:workspace from now on

- - - - -


1 changed file:

- 
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/sitemapresource/PageCopyTest.java


Changes:

=
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/sitemapresource/PageCopyTest.java
=
--- 
a/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/sitemapresource/PageCopyTest.java
+++ 
b/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/sitemapresource/PageCopyTest.java
@@ -510,12 +510,14 @@ public class PageCopyTest extends 
AbstractSiteMapResourceTest {
 moveAbstractPagesFromCommonToUnitTestProject();
 session.save();
 Thread.sleep(100);
-assertFalse("hst:abstractpages was expected to not exist before the 
copy page", 
session.nodeExists("/hst:hst/hst:configurations/unittestsubproject-preview/hst:abstractpages"));
+assertFalse("hst:abstractpages was expected to not exist before the 
copy page", 
session.nodeExists("/hst:hst/hst:configurations/unittestsubproject-preview/hst:workspace/hst:abstractpages"));
 crossChannelCopyNewsOverview(MountAction.DISCARD);
 // due to the discard, the 'hst:abstractpages' node should be entirely 
removed again since the live does not
 // have hst:abstractpages
 
assertFalse(session.nodeExists("/hst:hst/hst:configurations/unittestsubproject-preview/hst:abstractpages"));
 
assertFalse(session.nodeExists("/hst:hst/hst:configurations/unittestsubproject/hst:abstractpages"));
+
assertFalse(session.nodeExists("/hst:hst/hst:configurations/unittestsubproject-preview/hst:workspace/hst:abstractpages"));
+
assertFalse(session.nodeExists("/hst:hst/hst:configurations/unittestsubproject/hst:workspace/hst:abstractpages"));
 
 }
 



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

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/wpm] CHANNELMGR-1240 Add endpoint logic

[Michiel Rop]

Michiel Rop pushed to branch feature/wpm at cms-community / 
hippo-addon-channel-manager


Commits:
c1782ddf by Michiel Rop at 2017-04-24T15:17:59+02:00
CHANNELMGR-1240 Add endpoint logic

- Add logic for calling correct endpoint for select and create project.

- - - - -


1 changed file:

- frontend-ng/src/angularjs/services/project.service.js


Changes:

=
frontend-ng/src/angularjs/services/project.service.js
=
--- a/frontend-ng/src/angularjs/services/project.service.js
+++ b/frontend-ng/src/angularjs/services/project.service.js
@@ -19,12 +19,14 @@ const REST_API_PATH = 'ws/projects';
 
 class ProjectService {
 
-  constructor($http, ConfigService, PathService) {
+  constructor($http, ConfigService, PathService, ChannelService, HstService) {
 'ngInject';
 
 this.$http = $http;
 this.ConfigService = ConfigService;
 this.PathService = PathService;
+this.ChannelService = ChannelService;
+this.HstService = HstService;
   }
 
   projects(id) {
@@ -34,15 +36,11 @@ class ProjectService {
   }
 
   doCreateBranch(project) {
-// todo(mrop) add url
-const url = '';
-return this.$http({ method: 'POST', url, headers: {}, data: project });
+this.HstService.doPut(project.id, 
this.ChannelService.getChannel().mountId, 'createbranch');
   }
 
   doSelectBranch(project) {
-// todo(mrop) add url
-const url = '';
-return this.$http({ method: 'POST', url, headers: {}, data: project });
+this.HstService.doPost(project.id, 
this.ChannelService.getChannel().mountId, 'selectbranch');
   }
 
 }



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

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/wpm] HSTTWO-3980 Add url for create and select branch

[Michiel Rop]

Michiel Rop pushed to branch feature/wpm at cms-community / hippo-site-toolkit


Commits:
f2de294c by Michiel Rop at 2017-04-24T15:16:54+02:00
HSTTWO-3980 Add url for create and select branch

- add url for creating a new branch for a certain project
- add url for selecting a project

These urls are called from the project.service.js in the channel
manager to select and associate a project from a channel.

- - - - -


1 changed file:

- 
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java


Changes:

=
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
=
--- 
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
+++ 
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
@@ -31,6 +31,7 @@ import javax.jcr.query.QueryManager;
 import javax.jcr.query.QueryResult;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
@@ -177,6 +178,24 @@ public class MountResource extends AbstractConfigResource {
 return ok("New Page model loaded successfully", 
newPageModelRepresentation);
 }
 
+@POST
+@Path("/selectbranch")
+@Produces(MediaType.APPLICATION_JSON)
+public Response selectBranch(@QueryParam("mountId") final String mountId, 
String branchId) {
+log.debug("Select branch:{} of mount:{}", branchId, mountId);
+return ok("Branch selected successfully");
+}
+
+@PUT
+@Path("/createbranch")
+@Produces(MediaType.APPLICATION_JSON)
+public Response createBranch(@QueryParam("mountId") final String mountId, 
String branchId) {
+log.debug("Create branch:{} from mount:{}", branchId, mountId);
+return ok("Branch created successfully");
+}
+
+
+
 private NewPageModelRepresentation getNewPageModelRepresentation(final 
Mount mount) {
 PrototypesRepresentation prototypePagesRepresentation = new 
PrototypesRepresentation().represent(mount.getHstSite(),
 true, getPageComposerContextService());



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/f2de294c9ce89041c9da952bb195c4f4b0056f51
___
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 bugfix/HSTTWO-3942

[Oscar Scholten]

Oscar Scholten deleted branch bugfix/HSTTWO-3942 at cms-community / 
hippo-site-toolkit
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][bugfix/HSTTWO-3942] HSTTWO-3942 adding @PowerMockIgnore to suppress stacktraces, see CMS-10707

[Oscar Scholten]

Oscar Scholten pushed to branch bugfix/HSTTWO-3942 at cms-community / 
hippo-site-toolkit


Commits:
16ac86a2 by Oscar Scholten at 2017-04-24T13:54:11+02:00
HSTTWO-3942 adding @PowerMockIgnore to suppress stacktraces, see CMS-10707

- - - - -


1 changed file:

- 
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/PathInfoValidatorTest.java


Changes:

=
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/PathInfoValidatorTest.java
=
--- 
a/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/PathInfoValidatorTest.java
+++ 
b/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/PathInfoValidatorTest.java
@@ -24,6 +24,7 @@ import 
org.hippoecm.hst.pagecomposer.jaxrs.services.exceptions.ClientException;
 import org.hippoecm.hst.util.HstRequestUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -39,6 +40,7 @@ import static org.powermock.api.easymock.PowerMock.mockStatic;
 import static org.powermock.api.easymock.PowerMock.replay;
 
 @RunWith(PowerMockRunner.class)
+@PowerMockIgnore("javax.management.*")
 @PrepareForTest(HstRequestUtils.class)
 public class PathInfoValidatorTest {
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/16ac86a28309696f31f301cfa8decb839d1e8b5c
___
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][bugfix/HSTTWO-3942] 8 commits: HSTTWO-3958 Make sure resource bundle listener works correctly in multi site webapp

[Oscar Scholten]

Oscar Scholten pushed to branch bugfix/HSTTWO-3942 at cms-community / 
hippo-site-toolkit


Commits:
251e8365 by Ard Schrijvers at 2017-04-11T17:06:16+02:00
HSTTWO-3958 Make sure resource bundle listener works correctly in multi site 
webapp

The ResourceBundleWorkflowEventListener#getChannelName() did
not comply to the javadoc: the channel name must be unique per jvm.
 However in case of a multi HST webapp, this requirement was violated.

 Hence, prefix the channel name with the context path

- - - - -
f69f9943 by Tobias Jeger at 2017-04-12T09:36:55+02:00
HSTTWO-3958 Fix the listeners channelName to be a valid node 
name

- - - - -
8430e655 by Jeroen Hoffman at 2017-04-21T10:44:16+02:00
HSTTWO-3944 [forward port to master] to collect site map pages, use the 
configuration path of the argument mount, instead of the
mount that is currently being edited

(cherry picked from commit 0bf9af2fb89a1c76d0a643c037267832cc2faded)

- - - - -
4f877d49 by Ate Douma at 2017-04-23T03:08:31+02:00
HSTTWO-3978 upgrade to latest log4j2

This is part of CMS-10707

- - - - -
059b6d16 by Ate Douma at 2017-04-23T03:14:59+02:00
HSTTWO-3978 upgrade to latest log4j2

Updating the log4j2.xml files after committed rename (to keep history)

- - - - -
6df2b83a by Ate Douma at 2017-04-23T22:45:12+02:00
HSTTWO-3978 correct usage of file:// uri scheme for log4j configurationFile

See CMS-10711

- - - - -
fe6a27dd by Tobias Jeger at 2017-04-24T10:00:09+02:00
HSTTWO-3974 Reintroduce JCR event listener for resource bundle cache eviction

- keep separate cache for live and preview families
- (try to) invalidate both live and preview cache in case of RB-related JCR 
events

(cherry picked from commit 8fd10b2ab77d97839b69a2d1528420f3e67c03b8)

- - - - -
a503e923 by Oscar Scholten at 2017-04-24T13:53:51+02:00
HSTTWO-3942 merge branch master into bugfix/HSTTWO-3942

- - - - -


30 changed files:

- 
api/src/main/java/org/hippoecm/hst/resourcebundle/internal/MutableResourceBundleFamily.java
- − client-modules/cms-rest/src/test/resources/log4j.xml
- + client-modules/cms-rest/src/test/resources/log4j2.xml
- client-modules/page-composer/pom.xml
- 
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
- 
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ContainerItemComponentResourceTest.java
- 
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResourceTest.java
- 
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/MountResourceTest.java
- − client-modules/page-composer/src/test/resources/log4j.dtd
- − client-modules/page-composer/src/test/resources/log4j.xml
- + client-modules/page-composer/src/test/resources/log4j2.xml
- − client/src/test/resources/log4j.xml
- + client/src/test/resources/log4j2.xml
- components/core/pom.xml
- 
components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-observation.xml
- 
components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-resourcebundle.xml
- 
components/core/src/test/java/org/hippoecm/hst/configuration/model/BrokenModelConfigurationsIT.java
- 
components/core/src/test/java/org/hippoecm/hst/site/container/TestSpringComponentManagerWithAddonModules.java
- − components/core/src/test/resources/log4j.xml
- + components/core/src/test/resources/log4j2.xml
- − components/jaxrs/src/test/resources/log4j.xml
- + components/jaxrs/src/test/resources/log4j2.xml
- components/resourcebundle/pom.xml
- 
components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/DefaultMutableResourceBundleFamily.java
- 
components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/DefaultMutableResourceBundleRegistry.java
- + 
components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/HippoRepositoryResourceBundleEventListener.java
- 
components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/HippoRepositoryResourceBundleFamilyFactory.java
- − 
components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/ResourceBundleWorkflowEventListener.java
- 
components/resourcebundle/src/test/java/org/hippoecm/hst/resourcebundle/internal/DefaultMutableResourceBundleRegistryTest.java
- − components/resourcebundle/src/test/resources/log4j.xml


The diff was not included because it is too large.


View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/compare/558b41081c3900f0278a65fa3edee7c28ea79240...a503e9234a3e328ee04102f3b9826aa414e0ebb9
___
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 bugfix/HSTTWO-3907

[Tobias Jeger]

Tobias Jeger deleted branch bugfix/HSTTWO-3907 at cms-community / 
hippo-site-toolkit
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-9918] 63 commits: CMS-10633 CMS Diagnostics: add missing component diagnostics

[Arthur Bogaart]

Arthur Bogaart pushed to branch feature/CMS-9918 at cms-community / hippo-cms


Commits:
0f1292ac by Marijan Milicevic at 2017-03-06T11:21:42+01:00
CMS-10633 CMS Diagnostics: add missing  component  diagnostics
* add diagnostics code to measure folder loading time within CMS tree navigator

- - - - -
4405df00 by Arthur Bogaart at 2017-03-17T13:02:58+01:00
CMS-9963 Collapse to previous width instead of configured width

When enabling resizing for the second column of the content
perspective, the expand/collapse action should collapse back to
the previous width instead of the configured width, as the user
might have changed it.

To sync the UI during window resize, expanded units will be
expanded again, so only store the previous collapsed width when
unit is collapsed.

- - - - -
63229f04 by Arthur Bogaart at 2017-03-17T14:40:44+01:00
CMS-9295 Improve the UI of the change-password-dialog

- Replaced table layout with divs
- Fix missing username in message of CannotChangePasswordDialog
- Initially show message in yellow (warning), turn into red
(error) after form validation fails.
- better alignment and layout of text by adding more line-height
and pre-wrap
- new dialog sizes

- - - - -
10402b46 by Arthur Bogaart at 2017-03-17T16:19:38+01:00
CMS-9288 Use new Dialog in (de)publish all dialogs

Use auto-height dialog. Remove left-padding on table-data and add
a bit of vertical spacing between message and table-data

- - - - -
44e78c20 by Arthur Bogaart at 2017-03-17T16:49:08+01:00
CMS-9289 Initial code cleanup

- - - - -
b3311306 by Arthur Bogaart at 2017-03-20T09:53:48+01:00
CMS-9289 Update styling of permissions-workflow dialog

- - - - -
ddb1735f by Arthur Bogaart at 2017-03-20T10:20:11+01:00
CMS-9285 Code cleanup

- - - - -
01624f9d by Michiel Eggermont at 2017-03-20T11:43:26+01:00
CMS-10636 Set and use feature/wpm development version

- - - - -
944f51b6 by Michiel Eggermont at 2017-03-20T11:44:44+01:00
CMS-10644 Restructure PublicationWorkflowPlugin

Refactor the plugin so that it becomes easier to extend.
Also add a support method to enable form validation.

- - - - -
d2018021 by Arthur Bogaart at 2017-03-20T12:28:51+01:00
CMS-9285 Fix styling of reorder dialog

- moved CSS file to SASS
- use themed buttons
- fixed disabled buttons style
- top/bottom button can be disabled as well

- - - - -
9a88c976 by Arthur Bogaart at 2017-03-20T16:27:59+01:00
CMS-9285 Add scrolling back

- - - - -
72b61f72 by Arthur Bogaart at 2017-03-20T16:38:10+01:00
CMS-9285 Use SVG icons

- - - - -
85d8b78e by Arthur Bogaart at 2017-03-21T10:11:18+01:00
CMS-9245 Updated styling of destination dialog (copy  move)

Moved the question/answer to the bottom-left area of the
DestinationDialog.

- - - - -
1fedb1ca by Oscar Scholten at 2017-03-21T13:45:04+01:00
CMS-16 adding delta to explicitly set property type

- - - - -
8c2d522c by Michiel Eggermont at 2017-03-22T13:45:23+01:00
CMS-10636 Merge master into feature/wpm-refactoring

- - - - -
15659325 by Michiel Eggermont at 2017-03-22T13:46:08+01:00
CMS-10670 Rename wicket resource bundle

Since DocumentWorkflowImpl is now a subclass of
AbstractDocumentWorkflowImpl we can rename the
wicket resource bundle.

- - - - -
1a7526fa by Tobias Jeger at 2017-03-22T17:02:50+01:00
CMS-10672 Update commons-collections version to 3.2.2.

- - - - -
fee73353 by Michiel Eggermont at 2017-03-23T11:10:17+01:00
Revert CMS-10670 Rename wicket resource bundle

Aparently wicket does not look for a resource bundle of the
superclass if it cannot find a bundle for a class.
This reverts commit 15659325c75a75d326ceaa22f80238db33c664c0.

- - - - -
b2e0335c by Michiel Eggermont at 2017-03-23T12:33:20+01:00
CMS-10670 Add translation for scheduledpublishdepublish action

- - - - -
03df0942 by Arthur Bogaart at 2017-03-23T13:15:59+01:00
CMS-9963 Make left panel of browsePerspective resizeable by default

- - - - -
06650211 by Arthur Bogaart at 2017-03-23T13:20:45+01:00
CMS-9963 Reintegrate bugfix/CMS-9963

- - - - -
aa4096a4 by Arthur Bogaart at 2017-03-23T13:32:37+01:00
CMS-9963 Reload-on-startup for cms-static

- - - - -
f4fad6a8 by Arthur Bogaart at 2017-03-23T14:59:07+01:00
CMS-9295 Reintegrate bugfix/CMS-9295

- - - - -
e52249e2 by Arthur Bogaart at 2017-03-23T15:11:06+01:00
CMS-9288 Reintegrate bugfix/CMS-9288

- - - - -
eea3cba6 by Arthur Bogaart at 2017-03-23T15:26:34+01:00
CMS-9289 Reintegrate bugfix/CMS-9289

- - - - -
762b3105 by Arthur Bogaart at 2017-03-23T15:56:44+01:00
CMS-9245 Move question panel to the top

- add factory method for question panel

- - - - -
97f05990 by Arthur Bogaart at 2017-03-23T15:58:37+01:00
CMS-9245 Reintegrate bugfix/CMS-9245

- - - - -
8b2d512a by Arthur Bogaart at 2017-03-23T15:59:46+01:00
CMS-9245 Add license header

- - - - -
77da33de by Arthur Bogaart at 2017-03-24T11:10:09+01:00
CMS-9285 Use SVG icons in re-order dialog buttons

- - - - -
e9e02bc0 by Arthur Bogaart at 2017-03-24T11:12:59+01:00
CMS-9285 Reintegrate bugfix/CMS-9285

- - - - -
4b3d1388 by Jasper Floor at 

[HippoCMS-scm] [onehippo/ckeditor] 11668d: CHANNELMGR-1201 Add sharedspace plugin to build

[GitHub]

  Branch: refs/heads/feature/visual-editing-psp2
  Home:   https://github.com/onehippo/ckeditor
  Commit: 11668d2f7bcf59b22df7f86607b8753584ac5f60
  
https://github.com/onehippo/ckeditor/commit/11668d2f7bcf59b22df7f86607b8753584ac5f60
  Author: Joeri de Gooijer 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M dev/builder/build-config.js

  Log Message:
  ---
  CHANNELMGR-1201 Add sharedspace plugin to build


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

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/wpm] CHANNELMGR-1240 Add Full Channel Name to dropdown

[Michiel Rop]

Michiel Rop pushed to branch feature/wpm at cms-community / 
hippo-addon-channel-manager


Commits:
792ca7c2 by Michiel Rop at 2017-04-24T12:41:47+02:00
CHANNELMGR-1240 Add Full Channel Name to dropdown

- Add Full Channel Name to dropdown.
- Make backend call on to project ( when selecting the default no
  call is made )
- Remove $OnInit, because functionally is does not add anything.

- - - - -


2 changed files:

- frontend-ng/src/angularjs/channel/projectToggle/projectToggle.controller.js
- frontend-ng/src/angularjs/services/project.service.js


Changes:

=
frontend-ng/src/angularjs/channel/projectToggle/projectToggle.controller.js
=
--- 
a/frontend-ng/src/angularjs/channel/projectToggle/projectToggle.controller.js
+++ 
b/frontend-ng/src/angularjs/channel/projectToggle/projectToggle.controller.js
@@ -15,7 +15,6 @@
  *
  */
 
-const MASTER = { name: 'Default', id: 'master' };
 
 class ProjectToggleController {
   constructor($translate, OverlayService, ChannelService, ProjectService) {
@@ -26,14 +25,16 @@ class ProjectToggleController {
 this.ChannelService = ChannelService;
 this.ProjectService = ProjectService;
 this.available = ProjectService.available;
-this.withBranch = [MASTER];
-this.selectedProject = MASTER;
+const channel = ChannelService.getChannel();
+this.MASTER = { name: channel.name, id: channel.id };
+this.withBranch = [this.MASTER];
+this.selectedProject = this.MASTER;
 this._setProjects();
+this.available = false;
   }
-  $onInit() {
-this._activate();
+  $OnInit() {
+this.available = this.ProjectService.available;
   }
-
   _setProjects() {
 this.ProjectService.projects(this.ChannelService.getChannel().id)
   .then((response) => {
@@ -41,12 +42,8 @@ class ProjectToggleController {
 this.withoutBranch = response.withoutBranch;
   });
   }
-
-  _activate() {
-this._projectChanged();
-  }
-
-  _projectChanged() {
+  projectChanged() {
+if (this.selectedProject.id === this.MASTER.id) return;
 if (this.withBranch.indexOf(this.selectedProject) >= 0) {
   this.ProjectService.doSelectBranch(this.selectedProject);
 } else {


=
frontend-ng/src/angularjs/services/project.service.js
=
--- a/frontend-ng/src/angularjs/services/project.service.js
+++ b/frontend-ng/src/angularjs/services/project.service.js
@@ -25,21 +25,6 @@ class ProjectService {
 this.$http = $http;
 this.ConfigService = ConfigService;
 this.PathService = PathService;
-this.available = false;
-this.doInitializeIsAvailable();
-  }
-
-  doInitializeIsAvailable() {
-this.$http({
-  method: 'GET',
-  url: `${this.ConfigService.getCmsContextPath()}${REST_API_PATH}`,
-}).then(() => {
-  this.available = true;
-});
-  }
-
-  get isAvailable() {
-return this.available;
   }
 
   projects(id) {
@@ -48,13 +33,6 @@ class ProjectService {
   .then(result => result.data);
   }
 
-  _addBranch(branch) {
-return (project) => {
-  project.isBranch = branch;
-  return project;
-};
-  }
-
   doCreateBranch(project) {
 // todo(mrop) add url
 const url = '';



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/792ca7c2ff1b28c4fa5c7eb8de60c53518a22d27
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.4] JCR-4129: get rid of unused org.json dependency (ported to 2.4)

[GitLab Mirror]

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


Commits:
41cb6449 by Julian Reschke at 2017-04-24T09:43:10+00:00
JCR-4129: get rid of unused org.json dependency (ported to 2.4)

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

- - - - -


1 changed file:

- jackrabbit-parent/pom.xml


Changes:

=
jackrabbit-parent/pom.xml
=
--- a/jackrabbit-parent/pom.xml
+++ b/jackrabbit-parent/pom.xml
@@ -488,11 +488,6 @@
 3.0
   
   
-org.json
-json
-20070829
-  
-  
 junit
 junit
 4.10



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/41cb6449eb071c7d6ae5656e33004e4e744c7400
___
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/visual-editing-psp2-CMS-10706] 8 commits: CMS-10690 use repository utils to do reference checks

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/visual-editing-psp2-CMS-10706 at 
cms-community / hippo-cms


Commits:
37091fb7 by Bert Leunis at 2017-04-11T15:51:38+02:00
CMS-10690 use repository utils to do reference checks

- - - - -
12f90d74 by Jasper Floor at 2017-04-20T16:08:53+02:00
CMS-10690 Merge master changes in feature/CMS-10690

- - - - -
1343751f by Jasper Floor at 2017-04-20T16:09:13+02:00
CMS-10690 Merge master changes in feature/CMS-10690

- - - - -
6823cbe0 by Jasper Floor at 2017-04-20T16:27:21+02:00
CMS-10690 Reintegrate feature/CMS-10690

- - - - -
293700cf by Ate Douma at 2017-04-23T02:40:45+02:00
CMS-10707 upgrade to latest log4j2

- - - - -
4d7746fa by Ate Douma at 2017-04-23T02:45:49+02:00
CMS-10707 upgrade to latest log4j2

Updating the log4j2.xml files after committed rename (to keep history)

- - - - -
edbb3bd1 by Mathijs den Burger at 2017-04-24T09:32:55+02:00
CMS-10635 Merge master changes into feature/visual-editing-psp2

- - - - -
e6568612 by Mathijs den Burger at 2017-04-24T11:35:13+02:00
CMS-10706 Merge feature/visual-editing-psp2 changes

- - - - -


30 changed files:

- 
api/src/main/java/org/hippoecm/frontend/editor/workflow/model/ReferringDocumentsProvider.java
- api/src/main/styling/images/login/login-header.svg
- api/src/test/java/org/hippoecm/addon/workflow/FutureDateValidatorTest.java
- 
api/src/test/java/org/hippoecm/frontend/editor/workflow/model/ReferringDocumentsProviderTest.java
- − api/src/test/resources/log4j.xml
- + api/src/test/resources/log4j2.xml
- − automatic-export/repository/src/test/resources/log4j.dtd
- − automatic-export/repository/src/test/resources/log4j.xml
- + automatic-export/repository/src/test/resources/log4j2.xml
- − brokenlinks/repository/src/test/resources/log4j.xml
- + brokenlinks/repository/src/test/resources/log4j2.xml
- − brokenlinks/test/src/test/resources/log4j.dtd
- − brokenlinks/test/src/test/resources/log4j.xml
- + brokenlinks/test/src/test/resources/log4j2.xml
- builtin/pom.xml
- − editor/repository/src/test/resources/log4j.dtd
- − editor/repository/src/test/resources/log4j.xml
- + editor/repository/src/test/resources/log4j2.xml
- − editor/test/src/test/resources/log4j.dtd
- − editor/test/src/test/resources/log4j.xml
- + editor/test/src/test/resources/log4j2.xml
- + richtext/ckeditor/frontend/src/test/resources/log4j2.xml
- + richtext/frontend/src/test/resources/log4j2.xml
- − test/src/main/resources/log4j.dtd
- − test/src/main/resources/log4j.xml
- + test/src/main/resources/log4j2.xml
- − test/src/test/resources/log4j.dtd
- − test/src/test/resources/log4j.xml
- + test/src/test/resources/log4j2.xml
- − translation/test/src/test/resources/log4j.dtd


The diff was not included because it is too large.


View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/932ca250f00d38ba3106300a2f17d7768e5bd844...e65686124b3bbdf0222051a152ed541877392252
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp2-CHANNELMGR-1032] 13 commits: CHANNELMGR-1236 Wrap field elements in a collapse-element

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/visual-editing-psp2-CHANNELMGR-1032 
at cms-community / hippo-addon-channel-manager


Commits:
f216a707 by Arthur Bogaart at 2017-04-19T01:50:38+02:00
CHANNELMGR-1236 Wrap field elements in a collapse-element

- - - - -
cf8907a2 by Ard Schrijvers at 2017-04-19T09:00:26+02:00
CHANNELMGR-254 organize imports

- - - - -
aefe6cc0 by Joeri de Gooijer at 2017-04-19T16:51:58+02:00
CHANNELMGR-1222 Fix tooltips becoming wider than screen

- - - - -
11aeed3d by Joeri de Gooijer at 2017-04-19T16:53:35+02:00
CHANNELMGR-1222 Move some styling to directive folder

- - - - -
7f141554 by Joeri de Gooijer at 2017-04-19T16:54:23+02:00
CHANNELMGR-1222 Remove duplicate styling

- - - - -
ac0787de by Joeri de Gooijer at 2017-04-19T19:25:32+02:00
CHANNELMGR-1047 Refactor ckeditor component

It now reacts like the other form elements to focus, blur and changes.

- - - - -
5c534f29 by Joeri de Gooijer at 2017-04-21T11:33:47+02:00
CHANNELMGR-1222 Set max-width of 80% of viewport for tooltips

- - - - -
5f8c136b by Ariel Weinberger at 2017-04-21T11:51:33+02:00
Merge branch feature/visual-editing-psp2-CHANNELMGR-1222 into 
feature/visual-editing-psp2

- - - - -
7d0527fe by Ate Douma at 2017-04-23T03:18:22+02:00
CHANNELMGR-1243 upgrade to latest log4j2

This is part of CMS-10707

- - - - -
f4f170d9 by Ate Douma at 2017-04-23T03:19:16+02:00
CHANNELMGR-1243 upgrade to latest log4j2

Updating the log4j2.xml files after committed rename (to keep history)

- - - - -
66d62ef2 by Mathijs den Burger at 2017-04-24T09:34:19+02:00
CHANNELMGR-1174 Merge master changes into feature/visual-editing-psp2

- - - - -
e85db8a3 by Mathijs den Burger at 2017-04-24T11:26:21+02:00
CHANNELMGR-1244 Upgrade test to log4j2

- use the new Log4jInterceptor
- add the PowerMockIgnore annotation to reduce stack trace noise

- - - - -
1f08a157 by Mathijs den Burger at 2017-04-24T11:33:55+02:00
CHANNELMGR-1032 Merge feature/visual-editing-psp2 changes

- - - - -


30 changed files:

- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/ContentResourceTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImplTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/ContentTypeContextTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/DocumentTypesServiceImplTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeContextTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtilsTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/sort/NodeOrderFieldSorterTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/sort/TwoColumnFieldSorterTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/AbstractFieldTypeTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/ChoiceFieldTypeTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/ChoiceFieldUtilsTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/StringFieldTypeTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/util/LocalizationUtilsTest.java
- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/util/NamespaceUtilsTest.java
- − content-service/src/test/resources/log4j.xml
- + content-service/src/test/resources/log4j2.xml
- 
frontend-ng/src/angularjs/channel/actions/settings/property/helpIcon/helpIcon.directive.js
- 
frontend-ng/src/angularjs/channel/actions/settings/property/helpIcon/helpIcon.html
- 
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.scss
 → 
frontend-ng/src/angularjs/channel/actions/settings/property/helpIcon/helpIcon.scss
- 
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/choiceField/choiceField.html
- 
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.component.js
- 
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.component.spec.js
- 
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
- 
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.html
- + 
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss
- 
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.component.js
- 

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp2] CHANNELMGR-1244 Upgrade test to log4j2

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/visual-editing-psp2 at 
cms-community / hippo-addon-channel-manager


Commits:
e85db8a3 by Mathijs den Burger at 2017-04-24T11:26:21+02:00
CHANNELMGR-1244 Upgrade test to log4j2

- use the new Log4jInterceptor
- add the PowerMockIgnore annotation to reduce stack trace noise

- - - - -


1 changed file:

- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java


Changes:

=
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java
=
--- 
a/content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java
+++ 
b/content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java
@@ -33,8 +33,9 @@ import 
org.onehippo.cms.channelmanager.content.error.BadRequestException;
 import 
org.onehippo.cms.channelmanager.content.error.InternalServerErrorException;
 import org.onehippo.cms7.services.processor.html.HtmlProcessorFactory;
 import org.onehippo.repository.mock.MockNode;
-import org.onehippo.testutils.log4j.Log4jListener;
+import org.onehippo.testutils.log4j.Log4jInterceptor;
 import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -52,6 +53,7 @@ import static org.powermock.api.easymock.PowerMock.replay;
 import static org.powermock.api.easymock.PowerMock.replayAll;
 
 @RunWith(PowerMockRunner.class)
+@PowerMockIgnore("javax.management.*")
 @PrepareForTest({FieldTypeUtils.class, HtmlProcessorFactory.class})
 public class RichTextFieldTypeTest {
 
@@ -87,7 +89,7 @@ public class RichTextFieldTypeTest {
 }
 
 private static void assertWarningsLogged(final long count, final Code 
code, final Code... verifications) throws Exception {
-try (Log4jListener listener = Log4jListener.onWarn()) {
+try (Log4jInterceptor listener = 
Log4jInterceptor.onWarn().trap(RichTextFieldType.class).build()) {
 try {
 code.run();
 } finally {



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

[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.6] JCR-4129: get rid of unused org.json dependency (ported to 2.6)

[GitLab Mirror]

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


Commits:
e090fbde by Julian Reschke at 2017-04-24T09:21:49+00:00
JCR-4129: get rid of unused org.json dependency (ported to 2.6)

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

- - - - -


1 changed file:

- jackrabbit-parent/pom.xml


Changes:

=
jackrabbit-parent/pom.xml
=
--- a/jackrabbit-parent/pom.xml
+++ b/jackrabbit-parent/pom.xml
@@ -488,11 +488,6 @@
 3.0
   
   
-org.json
-json
-20070829
-  
-  
 junit
 junit
 4.10



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

[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.8] JCR-4129: get rid of unused org.json dependency (ported to 2.8)

[GitLab Mirror]

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


Commits:
b8e2fec9 by Julian Reschke at 2017-04-24T08:34:44+00:00
JCR-4129: get rid of unused org.json dependency (ported to 2.8)

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

- - - - -


1 changed file:

- jackrabbit-parent/pom.xml


Changes:

=
jackrabbit-parent/pom.xml
=
--- a/jackrabbit-parent/pom.xml
+++ b/jackrabbit-parent/pom.xml
@@ -495,11 +495,6 @@
 3.0
   
   
-org.json
-json
-20070829
-  
-  
 junit
 junit
 4.10



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

[HippoCMS-scm] [Git][cms-community/hippo-services-htmlprocessor][master] HHP-8: Revert "Add dependency on hippo-cms-testutils"

[Mathijs den Burger]

Mathijs den Burger pushed to branch master at cms-community / 
hippo-services-htmlprocessor


Commits:
760eb3cf by Mathijs den Burger at 2017-04-24T11:14:41+02:00
HHP-8: Revert Add dependency on hippo-cms-testutils

This reverts commit 8cef02fec725ed6e7ba3c7ab7ddfb03ccd876ad6.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,6 @@
 2.19
 
 
-1.0.0-SNAPSHOT
 3.0
 4.11
   
@@ -116,13 +115,6 @@
   test
 
 
-
-  org.onehippo.cms7
-  hippo-cms-testutils
-  ${hippo.testutils.version}
-  test
-
-
   
 
   



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

[HippoCMS-scm] [58810] attic/forge/rating-field/trunk: HIPFORGE-99 move rating-field code back from GitHub to SVN attic.

[jhoffman]

Revision: 58810
Author:   jhoffman
Date: 2017-04-24 11:06:49 +0200 (Mon, 24 Apr 2017)
Log Message:
---
HIPFORGE-99 move rating-field code back from GitHub to SVN attic. Plugin is 
unmaintained after all.

Added Paths:
---
attic/forge/rating-field/trunk/addon/
attic/forge/rating-field/trunk/addon/pom.xml
attic/forge/rating-field/trunk/addon/src/
attic/forge/rating-field/trunk/addon/src/main/
attic/forge/rating-field/trunk/addon/src/main/java/
attic/forge/rating-field/trunk/addon/src/main/java/org/
attic/forge/rating-field/trunk/addon/src/main/java/org/onehippo/
attic/forge/rating-field/trunk/addon/src/main/java/org/onehippo/forge/

attic/forge/rating-field/trunk/addon/src/main/java/org/onehippo/forge/rating/

attic/forge/rating-field/trunk/addon/src/main/java/org/onehippo/forge/rating/RatingPlugin.html

attic/forge/rating-field/trunk/addon/src/main/java/org/onehippo/forge/rating/RatingPlugin.java

attic/forge/rating-field/trunk/addon/src/main/java/org/onehippo/forge/rating/model/

attic/forge/rating-field/trunk/addon/src/main/java/org/onehippo/forge/rating/model/Rating.java
attic/forge/rating-field/trunk/addon/src/main/resources/

attic/forge/rating-field/trunk/addon/src/main/resources/hippoecm-extension.xml
attic/forge/rating-field/trunk/addon/src/main/resources/type-rating.xml
attic/forge/rating-field/trunk/addon/src/test/
attic/forge/rating-field/trunk/addon/src/test/java/
attic/forge/rating-field/trunk/addon/src/test/java/org/
attic/forge/rating-field/trunk/addon/src/test/java/org/onehippo/
attic/forge/rating-field/trunk/addon/src/test/java/org/onehippo/forge/

attic/forge/rating-field/trunk/addon/src/test/java/org/onehippo/forge/rating/

attic/forge/rating-field/trunk/addon/src/test/java/org/onehippo/forge/rating/model/

attic/forge/rating-field/trunk/addon/src/test/java/org/onehippo/forge/rating/model/RatingTest.java
attic/forge/rating-field/trunk/cms/
attic/forge/rating-field/trunk/cms/README.txt
attic/forge/rating-field/trunk/cms/clean.sh
attic/forge/rating-field/trunk/cms/eclipse.sh
attic/forge/rating-field/trunk/cms/jetty/
attic/forge/rating-field/trunk/cms/jetty/atomikos-util-3.1.4.jar
attic/forge/rating-field/trunk/cms/jetty/geronimo-jta_1.1_spec-1.1.jar
attic/forge/rating-field/trunk/cms/jetty/transactions-3.1.4.jar
attic/forge/rating-field/trunk/cms/jetty/transactions-api-3.1.4.jar
attic/forge/rating-field/trunk/cms/jetty/transactions-jta-3.1.4.jar
attic/forge/rating-field/trunk/cms/pom.xml
attic/forge/rating-field/trunk/cms/src/
attic/forge/rating-field/trunk/cms/src/main/
attic/forge/rating-field/trunk/cms/src/main/webapp/
attic/forge/rating-field/trunk/cms/src/main/webapp/WEB-INF/
attic/forge/rating-field/trunk/cms/src/main/webapp/WEB-INF/web.xml
attic/forge/rating-field/trunk/pom.xml

Removed Paths:
-
attic/forge/rating-field/trunk/MOVED.txt

Deleted: attic/forge/rating-field/trunk/MOVED.txt
===
--- attic/forge/rating-field/trunk/MOVED.txt2017-03-03 08:46:31 UTC (rev 
58809)
+++ attic/forge/rating-field/trunk/MOVED.txt2017-04-24 09:06:49 UTC (rev 
58810)
@@ -1 +0,0 @@
-Moved to https://github.com/onehippo-forge/rating-field

Added: attic/forge/rating-field/trunk/addon/pom.xml
===
--- attic/forge/rating-field/trunk/addon/pom.xml
(rev 0)
+++ attic/forge/rating-field/trunk/addon/pom.xml2017-04-24 09:06:49 UTC 
(rev 58810)
@@ -0,0 +1,148 @@
+
+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
+
+  
+org.onehippo.forge
+rating
+1.01.00-SNAPSHOT
+  
+
+  Rating Editor Plugin
+  Rating Editor Plugin
+  org.onehippo.forge
+  rating-addon
+  jar
+
+  
+
+  org.hippoecm
+  hippo-ecm-addon-editor-frontend
+
+
+  org.hippoecm
+  hippo-ecm-frontend-engine
+
+
+
+
+  org.hippoecm
+  hippo-ecm-frontend-engine-test
+  ${hippoecm.version}
+  test
+
+
+  org.hippoecm
+  hippo-ecm-repository-engine
+  ${hippoecm.version}
+  test
+
+
+  org.slf4j
+  slf4j-log4j12
+  test
+
+
+  junit
+  junit
+  4.4
+  test
+
+
+
+
+  javax.servlet
+  servlet-api
+  provided
+
+
+
+
+  com.atomikos
+  transactions-api
+  test
+
+
+  com.atomikos
+  transactions
+  test
+
+
+  com.atomikos
+  transactions-jta
+  test
+
+
+  com.atomikos
+  atomikos-util
+  test
+
+
+  org.apache.geronimo.specs
+  geronimo-jta_1.1_spec
+  provided
+
+  
+
+  
+

[HippoCMS-scm] [Git][cms-community/hippo-services-htmlprocessor][master] HHP-8 Add dependency on hippo-cms-testutils

[Mathijs den Burger]

Mathijs den Burger pushed to branch master at cms-community / 
hippo-services-htmlprocessor


Commits:
8cef02fe by Mathijs den Burger at 2017-04-24T10:52:36+02:00
HHP-8 Add dependency on hippo-cms-testutils

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
 2.19
 
 
+1.0.0-SNAPSHOT
 3.0
 4.11
   
@@ -115,6 +116,13 @@
   test
 
 
+
+  org.onehippo.cms7
+  hippo-cms-testutils
+  ${hippo.testutils.version}
+  test
+
+
   
 
   



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

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/wpm] HSTTWO-3979 Make sure to return a cloned Channel object from cache

[Ard Schrijvers]

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


Commits:
9ea35162 by Ard Schrijvers at 2017-04-24T10:43:31+02:00
HSTTWO-3979 Make sure to return a cloned Channel object from cache

This is to avoid that a Channel object can later on be changed for running 
requests

- - - - -


1 changed file:

- 
components/core/src/main/java/org/hippoecm/hst/configuration/cache/HstConfigurationLoadingCache.java


Changes:

=
components/core/src/main/java/org/hippoecm/hst/configuration/cache/HstConfigurationLoadingCache.java
=
--- 
a/components/core/src/main/java/org/hippoecm/hst/configuration/cache/HstConfigurationLoadingCache.java
+++ 
b/components/core/src/main/java/org/hippoecm/hst/configuration/cache/HstConfigurationLoadingCache.java
@@ -145,7 +145,7 @@ public class HstConfigurationLoadingCache implements 
HstEventConsumer {
 
 Channel channel = channelsCache.get(cachekey);
 if (channel != null ) {
-return channel;
+return clone(channel);
 }
 
 CompositeConfigurationNodes.CompositeConfigurationNode 
channelCompositeNode = 
ccn.getCompositeConfigurationNodes().get(NODENAME_HST_CHANNEL);
@@ -169,7 +169,13 @@ public class HstConfigurationLoadingCache implements 
HstEventConsumer {
 events.add(configurationPath + 
"-preview/hst:workspace/hst:channel");
 }
 channelsCache.put(cachekey, channel, events.toArray(new 
String[events.size()]));
-return channel;
+return clone(channel);
+}
+
+// since org.hippoecm.hst.configuration.site.HstSiteService.init() can 
change the Channel object with
+// setters, we return a cloned Channel object to avoid an existing Channel 
object to be changed
+private Channel clone(final Channel channel) {
+return new Channel(channel);
 }
 
 /**



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/9ea35162cb6569ddae5e3e978d5a14b332ea1a12
___
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.1] HSTTWO-3972 Remove lingering empty class file

[Tobias Jeger]

Tobias Jeger pushed to branch release/4.1 at cms-community / hippo-site-toolkit


Commits:
49381f94 by Tobias Jeger at 2017-04-24T10:27:47+02:00
HSTTWO-3972 Remove lingering empty class file

- - - - -


1 changed file:

- − 
components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/ResourceBundleWorkflowEventListener.java


Changes:

=
components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/ResourceBundleWorkflowEventListener.java
 deleted
=
--- 
a/components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/ResourceBundleWorkflowEventListener.java
+++ /dev/null



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

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][release/3.2] HSTTWO-3973 Remove lingering empty class file

[Tobias Jeger]

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


Commits:
a3e90513 by Tobias Jeger at 2017-04-24T10:25:30+02:00
HSTTWO-3973 Remove lingering empty class file

- - - - -


1 changed file:

- − 
components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/ResourceBundleWorkflowEventListener.java


Changes:

=
components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/ResourceBundleWorkflowEventListener.java
 deleted
=
--- 
a/components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/ResourceBundleWorkflowEventListener.java
+++ /dev/null



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/a3e90513c8bd79dd5032831a7b368b4e4ace51ed
___
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 bugfix/HSTTWO-3973

[Tobias Jeger]

Tobias Jeger deleted branch bugfix/HSTTWO-3973 at cms-community / 
hippo-site-toolkit
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

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

[Tobias Jeger]

Tobias Jeger deleted branch bugfix/HSTTWO-3972 at cms-community / 
hippo-site-toolkit
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

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

[Tobias Jeger]

Tobias Jeger deleted branch bugfix/HSTTWO-3952 at cms-community / 
hippo-site-toolkit
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/visual-editing-psp2] 7 commits: CMS-10690 use repository utils to do reference checks

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/visual-editing-psp2 at 
cms-community / hippo-cms


Commits:
37091fb7 by Bert Leunis at 2017-04-11T15:51:38+02:00
CMS-10690 use repository utils to do reference checks

- - - - -
12f90d74 by Jasper Floor at 2017-04-20T16:08:53+02:00
CMS-10690 Merge master changes in feature/CMS-10690

- - - - -
1343751f by Jasper Floor at 2017-04-20T16:09:13+02:00
CMS-10690 Merge master changes in feature/CMS-10690

- - - - -
6823cbe0 by Jasper Floor at 2017-04-20T16:27:21+02:00
CMS-10690 Reintegrate feature/CMS-10690

- - - - -
293700cf by Ate Douma at 2017-04-23T02:40:45+02:00
CMS-10707 upgrade to latest log4j2

- - - - -
4d7746fa by Ate Douma at 2017-04-23T02:45:49+02:00
CMS-10707 upgrade to latest log4j2

Updating the log4j2.xml files after committed rename (to keep history)

- - - - -
edbb3bd1 by Mathijs den Burger at 2017-04-24T09:32:55+02:00
CMS-10635 Merge master changes into feature/visual-editing-psp2

- - - - -


30 changed files:

- 
api/src/main/java/org/hippoecm/frontend/editor/workflow/model/ReferringDocumentsProvider.java
- api/src/main/styling/images/login/login-header.svg
- api/src/test/java/org/hippoecm/addon/workflow/FutureDateValidatorTest.java
- 
api/src/test/java/org/hippoecm/frontend/editor/workflow/model/ReferringDocumentsProviderTest.java
- − api/src/test/resources/log4j.xml
- + api/src/test/resources/log4j2.xml
- − automatic-export/repository/src/test/resources/log4j.dtd
- − automatic-export/repository/src/test/resources/log4j.xml
- + automatic-export/repository/src/test/resources/log4j2.xml
- − brokenlinks/repository/src/test/resources/log4j.xml
- + brokenlinks/repository/src/test/resources/log4j2.xml
- − brokenlinks/test/src/test/resources/log4j.dtd
- − brokenlinks/test/src/test/resources/log4j.xml
- + brokenlinks/test/src/test/resources/log4j2.xml
- builtin/pom.xml
- − editor/repository/src/test/resources/log4j.dtd
- − editor/repository/src/test/resources/log4j.xml
- + editor/repository/src/test/resources/log4j2.xml
- − editor/test/src/test/resources/log4j.dtd
- − editor/test/src/test/resources/log4j.xml
- + editor/test/src/test/resources/log4j2.xml
- + richtext/ckeditor/frontend/src/test/resources/log4j2.xml
- + richtext/frontend/src/test/resources/log4j2.xml
- − test/src/main/resources/log4j.dtd
- − test/src/main/resources/log4j.xml
- + test/src/main/resources/log4j2.xml
- − test/src/test/resources/log4j.dtd
- − test/src/test/resources/log4j.xml
- + test/src/test/resources/log4j2.xml
- − translation/test/src/test/resources/log4j.dtd


The diff was not included because it is too large.


View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/f13c261d28eda3bbbeadc762b395cf958abd9612...edbb3bd1100aaadd72788d7605a3b2a97d3c8fb5
___
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/visual-editing-psp2] 15 commits: REPO-1651 add document reference utilities

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/visual-editing-psp2 at 
cms-community / hippo-repository


Commits:
0a5dfa13 by Bert Leunis at 2017-04-07T15:54:07+02:00
REPO-1651 add document reference utilities

- - - - -
b2464549 by Bert Leunis at 2017-04-07T16:44:18+02:00
REPO-1651 unit test for #hasAdvailability method

- - - - -
0bde5874 by Bert Leunis at 2017-04-10T14:28:49+02:00
REPO-1651 unit tests for reference utilities

- - - - -
096ba2ae by Bert Leunis at 2017-04-10T16:23:51+02:00
REPO-1651 provide not only ids but also nodes

- - - - -
1ed8ecda by Bert Leunis at 2017-04-10T16:26:45+02:00
REPO-1651 Merge master changes in development branch

- - - - -
fbb31937 by Bert Leunis at 2017-04-11T15:37:43+02:00
REPO-1651 provide not only ids but also nodes also for references to 
unpublished documents

- - - - -
38cdd592 by Michiel Eggermont at 2017-04-20T13:33:23+02:00
REPO-1656 Set farthest request host on http session.

- - - - -
21812303 by Michiel Eggermont at 2017-04-20T15:08:32+02:00
REPO-1656 Fix JUnit tests

- - - - -
230c269f by Jasper Floor at 2017-04-20T15:49:04+02:00
REPO-1651 small refactor for simplicity

- - - - -
29878f05 by Jasper Floor at 2017-04-20T15:54:59+02:00
REPO-1651 Merge master changes in feature/REPO-1651

- - - - -
68049016 by Jasper Floor at 2017-04-20T16:04:36+02:00
REPO-1651 Reintegrate feature/REPO-1651

- - - - -
5c4e89d8 by Ate Douma at 2017-04-23T02:18:06+02:00
REPO-1658 Upgrade from log4j1 to latest log4j2

This is part of CMS-10707.
This also removed the ExecuteOnLogLevel unit test utility which is replaced by 
the new log4j2 Log4jInterceptor in hippo-cms-testutils (CMS-10709)
Furthermore the log4j1 StringMatchFilter is removed which has been 
re-implemented in hippo-cms-testutils (CMS-10710)

- - - - -
7b1a0ad2 by Ate Douma at 2017-04-23T02:24:36+02:00
REPO-1658 Upgrade from log4j1 to latest log4j2

Updating the log4j2.xml files after committed rename (to keep history)

- - - - -
3d80a8de by Ate Douma at 2017-04-23T02:25:00+02:00
REPO-1659 Support log4j2 in LoggingServlet

This is part of REPO-1658 and CMS-10707

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

- - - - -


30 changed files:

- builtin/src/main/java/org/hippoecm/repository/util/WorkflowUtils.java
- builtin/src/test/java/org/hippoecm/repository/util/WorkflowUtilsTest.java
- − config/src/test/resources/log4j.dtd
- − config/src/test/resources/log4j.xml
- + config/src/test/resources/log4j2.xml
- deprecated/facetsearch/pom.xml
- − deprecated/facetsearch/src/test/resources/log4j.xml
- + deprecated/facetsearch/src/test/resources/log4j2.xml
- deprecated/facetselectmirror/pom.xml
- − engine/src/test/resources/log4j.dtd
- − engine/src/test/resources/log4j.xml
- + engine/src/test/resources/log4j2.xml
- 
jaxrs/src/main/java/org/onehippo/repository/jaxrs/api/ManagedUserSessionInvoker.java
- 
jaxrs/src/test/java/org/onehippo/repository/jaxrs/RepositoryJaxrsServiceTest.java
- 
jaxrs/src/test/java/org/onehippo/repository/jaxrs/api/ManagedUserSessionInvokerTest.java
- − jaxrs/src/test/resources/log4j.xml
- + jaxrs/src/test/resources/log4j2.xml
- − modules/src/test/resources/log4j.dtd
- − modules/src/test/resources/log4j.xml
- + modules/src/test/resources/log4j2.xml
- pom.xml
- servlets/pom.xml
- + servlets/src/main/java/org/hippoecm/repository/JDK14LoggerLevelManager.java
- + servlets/src/main/java/org/hippoecm/repository/Log4j1LoggerLevelManager.java
- + servlets/src/main/java/org/hippoecm/repository/Log4j2LoggerLevelManager.java
- servlets/src/main/java/org/hippoecm/repository/LoggingServlet.java
- test/pom.xml
- + 
test/src/test/java/org/hippoecm/repository/util/WorkflowUtilsReferencesTest.java
- − test/src/test/resources/log4j.dtd
- − test/src/test/resources/log4j.xml


The diff was not included because it is too large.


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