[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][bugfix/HIPPLUG-1263] HIPPLUG-1263: reverted the re-addition of serialVersionUID fields
Jeroen Hoffman pushed to branch bugfix/HIPPLUG-1263 at cms-community /
hippo-plugin-taxonomy
Commits:
eb476886 by Jeroen Hoffman at 2016-04-22T21:37:12+02:00
HIPPLUG-1263: reverted the re-addition of serialVersionUID fields
- - - - -
2 changed files:
-
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyEditorPlugin.java
-
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrTaxonomy.java
Changes:
=
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyEditorPlugin.java
=
---
a/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyEditorPlugin.java
+++
b/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyEditorPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 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.
@@ -99,8 +99,6 @@ import org.slf4j.LoggerFactory;
/**
* TaxonomyEditorPlugin used when editing taxonomy documents.
- *
- * @version $Id$
*/
public class TaxonomyEditorPlugin extends RenderPlugin {
@@ -142,8 +140,6 @@ public class TaxonomyEditorPlugin extends
RenderPlugin {
synonymModel = new IModel() {
-private static final long serialVersionUID = 1L;
-
public String[] getObject() {
EditableCategoryInfo info =
taxonomy.getCategoryByKey(key).getInfo(currentLanguageSelection.getLanguageCode());
return info.getSynonyms();
@@ -224,8 +220,6 @@ public class TaxonomyEditorPlugin extends
RenderPlugin {
DropDownChoice languageSelectionChoice =
new DropDownChoice<>("language", new PropertyModel<>(this,
"currentLanguageSelection"), availableLanguageSelections, choiceRenderer);
languageSelectionChoice.add(new OnChangeAjaxBehavior() {
-private static final long serialVersionUID = 1L;
-
@Override
protected void onUpdate(AjaxRequestTarget target) {
redraw();
@@ -467,8 +461,6 @@ public class TaxonomyEditorPlugin extends
RenderPlugin {
final int j = i;
list.add(new IModel() {
-private static final long serialVersionUID = 1L;
-
public String getObject() {
String[] synonyms = synonymModel.getObject();
return synonyms[j];
@@ -607,7 +599,6 @@ public class TaxonomyEditorPlugin extends
RenderPlugin {
protected final class LanguageSelection implements Serializable {
-private static final long serialVersionUID = 1L;
private String languageCode;
private String displayName;
=
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrTaxonomy.java
=
---
a/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrTaxonomy.java
+++
b/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrTaxonomy.java
@@ -41,8 +41,7 @@ import org.slf4j.LoggerFactory;
public class JcrTaxonomy extends TaxonomyObject implements EditableTaxonomy {
-private static final Logger log =
LoggerFactory.getLogger(JcrTaxonomy.class);
-private static final long serialVersionUID = 1L;
+static final Logger log = LoggerFactory.getLogger(JcrTaxonomy.class);
private transient Map categories;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/eb4768865573504d255f0b9b3dfabc0ae71f5b3a
___
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] Pushed new branch feature/cmng-psp1-HSTTWO-3650
Canh Ngo pushed new branch feature/cmng-psp1-HSTTWO-3650 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][master] CMS-10066: Updating page title to 11
Oscar Scholten pushed to branch master at cms-community / hippo-cms Commits: fe0222d9 by Oscar Scholten at 2016-04-22T17:16:47+02:00 CMS-10066: Updating page title to 11 - - - - - 1 changed file: - engine/src/main/java/org/hippoecm/frontend/plugins/login/LoginPlugin.properties Changes: = engine/src/main/java/org/hippoecm/frontend/plugins/login/LoginPlugin.properties = --- a/engine/src/main/java/org/hippoecm/frontend/plugins/login/LoginPlugin.properties +++ b/engine/src/main/java/org/hippoecm/frontend/plugins/login/LoginPlugin.properties @@ -1,4 +1,4 @@ -page.title=Hippo CMS 10 +page.title=Hippo CMS 11 header=Login username-label=Username: password-label=Password: View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/fe0222d9ca7e4004e4cf4d71523ba4310291ed5c ___ 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 cmng-psp1-CHANNELMGR-555
Arthur Bogaart pushed new branch cmng-psp1-CHANNELMGR-555 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/cmng-psp1-CHANNELMGR-555
Arthur Bogaart pushed new branch feature/cmng-psp1-CHANNELMGR-555 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch cmng-psp1-CHANNELMGR-555
Arthur Bogaart deleted branch cmng-psp1-CHANNELMGR-555 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 bugfix/CMS-9894
Jeroen Hoffman deleted branch bugfix/CMS-9894 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-addon-channel-manager] Deleted branch feature/cmng-psp1-CHANNELMGR-611
Tobias Jeger deleted branch feature/cmng-psp1-CHANNELMGR-611 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1] CHANNELMGR-331 Put qa-label attribute on overlay elements
Tobias Jeger pushed to branch feature/cmng-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
7e26d167 by Tobias Jeger at 2016-04-22T12:32:11+02:00
CHANNELMGR-331 Put qa-label attribute on overlay elements
- - - - -
1 changed file:
-
frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlayElement.controller.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlayElement.controller.js
=
---
a/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlayElement.controller.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlayElement.controller.js
@@ -24,6 +24,7 @@ export class OverlayElementCtrl {
this.OverlaySyncService = OverlaySyncService;
this.structureElement.setJQueryElement('overlay', $element);
this._prepareIframeElement($scope);
+$element.attr('qa-label', this.getLabel());
// the share data-model between controllers
$scope.structureElement = this.structureElement;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/7e26d16771161f375619e2ba68dae925c6661631
___
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/cmng-psp1] CHANNELMGR-331 Remove page structure log message
Tobias Jeger pushed to branch feature/cmng-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
60d424bc by Tobias Jeger at 2016-04-22T12:27:42+02:00
CHANNELMGR-331 Remove page structure log message
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
@@ -134,7 +134,6 @@ export class HippoIframeCtrl {
iframeDom,
this.PageStructureService.registerParsedElement.bind(this.PageStructureService)
);
-this.PageStructureService.printParsedElements();
}
_updateChannelIfSwitched() {
=
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
=
---
a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
@@ -116,7 +116,6 @@ describe('hippoIframeCtrl', () => {
const deferred = $q.defer();
spyOn(PageStructureService, 'clearParsedElements');
-spyOn(PageStructureService, 'printParsedElements');
spyOn(hstCommentsProcessorService, 'run');
spyOn(PageMetaDataService, 'getChannelId').and.returnValue('channelX');
spyOn(ChannelService, 'getId').and.returnValue('channelY');
@@ -128,7 +127,6 @@ describe('hippoIframeCtrl', () => {
hippoIframeCtrl.onLoad();
expect(PageStructureService.clearParsedElements).toHaveBeenCalled();
-expect(PageStructureService.printParsedElements).toHaveBeenCalled();
expect(hstCommentsProcessorService.run).toHaveBeenCalled();
expect(hippoIframeCtrl._updateDragDrop).toHaveBeenCalled();
expect(PageMetaDataService.getChannelId).toHaveBeenCalled();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/60d424bccb77a5be783186a67f3131ed7d255f22
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/cmng-psp1-CHANNELMGR-561
Tobias Jeger deleted branch feature/cmng-psp1-CHANNELMGR-561 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/cmng-psp1-CHANNELMGR-611
Mathijs den Burger pushed new branch feature/cmng-psp1-CHANNELMGR-611 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Deleted branch feature/cmng-psp1-HSTTWO-3645
Tobias Jeger deleted branch feature/cmng-psp1-HSTTWO-3645 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-addon-channel-manager] Deleted branch feature/cmng-psp1-CHANNELMGR-610
Tobias Jeger deleted branch feature/cmng-psp1-CHANNELMGR-610 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1-CHANNELMGR-610] CHANNELMGR-610 Test the return value of the changes HstService methods
Tobias Jeger pushed to branch feature/cmng-psp1-CHANNELMGR-610 at cms-community
/ hippo-addon-channel-manager
Commits:
7d084f25 by Tobias Jeger at 2016-04-22T10:50:34+02:00
CHANNELMGR-610 Test the return value of the changes HstService methods
- - - - -
1 changed file:
- frontend-ng/src/angularjs/api/hst.service.spec.js
Changes:
=
frontend-ng/src/angularjs/api/hst.service.spec.js
=
--- a/frontend-ng/src/angularjs/api/hst.service.spec.js
+++ b/frontend-ng/src/angularjs/api/hst.service.spec.js
@@ -235,19 +235,25 @@ describe('HstService', () => {
});
it('removes an exist component from a container', () => {
+const promiseSpy = jasmine.createSpy('promiseSpy');
const url = `${contextPath}${apiUrlPrefix}/container-1./component-foo`;
$httpBackend.expectDELETE(url).respond(200);
-hstService.removeHstComponent('container-1', 'component-foo');
+hstService.removeHstComponent('container-1',
'component-foo').then(promiseSpy);
$httpBackend.flush();
+
+expect(promiseSpy).toHaveBeenCalled();
});
it('updates component orders of a container', () => {
+const promiseSpy = jasmine.createSpy('promiseSpy');
const url = `${contextPath}${apiUrlPrefix}/container-1./`;
$httpBackend.expectPUT(url, { foo: 'foo-value', baa: 'baah'
}).respond(200);
-hstService.updateHstComponent('container-1', { foo: 'foo-value', baa:
'baah' });
+hstService.updateHstComponent('container-1', { foo: 'foo-value', baa:
'baah' }).then(promiseSpy);
$httpBackend.flush();
+
+expect(promiseSpy).toHaveBeenCalled();
});
it('extracts the sitemap from the returned pages response', () => {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/7d084f25ce3e8202a5bbc40ef6ca2b0e61440ee9
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
