[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.12] JCR-4142: update junit dependency to 4.12 (ported to 2.12)
GitLab Mirror pushed to branch 2.12 at cms-community / hippo-jackrabbit Commits: 46907ab9 by Julian Reschke at 2017-09-28T06:30:03+00:00 JCR-4142: update junit dependency to 4.12 (ported to 2.12) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.12@1809947 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 @@ -502,7 +502,7 @@ junit junit -4.10 +4.12 com.google.code.findbugs View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/46907ab964cd0447c63e2d46db42825091db8849 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/46907ab964cd0447c63e2d46db42825091db8849 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Pushed new branch feature/HSTTWO-3384_4103_4133
Woonsan Ko pushed new branch feature/HSTTWO-3384_4103_4133 at cms-community / hippo-site-toolkit --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/tree/feature/HSTTWO-3384_4103_4133 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-services-api][feature/CMS-10897] CMS-10897 remove pointless RuntimeException javadoc mention
Ard Schrijvers pushed to branch feature/CMS-10897 at cms-community / hippo-services-api Commits: 7fafe01a by Ard Schrijvers at 2017-09-28T00:00:47+02:00 CMS-10897 remove pointless RuntimeException javadoc mention The lock manager impl shouldn't throw a runtime exception but just log a warning or error in case something completely unexpected happens (like failing database connection) - - - - - 1 changed file: - src/main/java/org/onehippo/cms7/services/lock/LockManager.java Changes: = src/main/java/org/onehippo/cms7/services/lock/LockManager.java = --- a/src/main/java/org/onehippo/cms7/services/lock/LockManager.java +++ b/src/main/java/org/onehippo/cms7/services/lock/LockManager.java @@ -83,7 +83,6 @@ public interface LockManager { *the {@link LockManager} implementation most likely logging a warning or error, because it is an *implementation issue if {@code unlock(key)} is invoked by a thread that does not hold the lock. * @throws IllegalArgumentException if the {@code key} exceeds 256 chars - * @throws RuntimeException in case some error occurs. */ void unlock(String key); @@ -95,7 +94,6 @@ public interface LockManager { * * @param key the {@code key} to check whether there is a lock for * @return {@code true} when locked - * @throws RuntimeException in case some error occurs. */ boolean isLocked(String key); @@ -123,7 +121,6 @@ public interface LockManager { * * @param key the {@code key} to check whether there is a lock for * @throws IllegalArgumentException if the {@code key} exceeds 256 chars - * @throws RuntimeException in case some error occurs. */ void abort(String key); View it on GitLab: https://code.onehippo.org/cms-community/hippo-services-api/commit/7fafe01a54ebdb973f36547d16e5aa58d5c90854 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-services-api/commit/7fafe01a54ebdb973f36547d16e5aa58d5c90854 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-testsuite][feature/HSTTWO-4103] HSTTWO-4103: bump up parent pom version in api-docs
Woonsan Ko pushed to branch feature/HSTTWO-4103 at cms-community / hippo-testsuite Commits: b446548b by Woonsan Ko at 2017-09-27T15:57:17-04:00 HSTTWO-4103: bump up parent pom version in api-docs - - - - - 1 changed file: - api-docs/pom.xml Changes: = api-docs/pom.xml = --- a/api-docs/pom.xml +++ b/api-docs/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-testsuite -4.0.1-SNAPSHOT +4.1.0-SNAPSHOT Hippo Test Suite API Docs View it on GitLab: https://code.onehippo.org/cms-community/hippo-testsuite/commit/b446548bc65191feb84362386756ed8469d15dc7 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-testsuite/commit/b446548bc65191feb84362386756ed8469d15dc7 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/HSTTWO-4103] HSTTWO-4103: excluding old jaxrs 1.1 spec jar
Woonsan Ko pushed to branch feature/HSTTWO-4103 at cms-community / hippo-site-toolkit Commits: faea2ff9 by Woonsan Ko at 2017-09-27T15:56:31-04:00 HSTTWO-4103: excluding old jaxrs 1.1 spec jar - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -622,6 +622,12 @@ io.swagger swagger-jaxrs ${swagger-jaxrs.version} + + +javax.ws.rs +jsr311-api + + View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/faea2ff9cd7d5fbecb8a460c0029f8df079a4bcd --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/faea2ff9cd7d5fbecb8a460c0029f8df079a4bcd You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-services-api][feature/CMS-10897] CMS-10897 Don't throw LockException on a couple of methods
Ard Schrijvers pushed to branch feature/CMS-10897 at cms-community / hippo-services-api Commits: 669db680 by Ard Schrijvers at 2017-09-27T16:56:08+02:00 CMS-10897 Don't throw LockException on a couple of methods Otherwise typically end projects have to try / catch again in finally block where they invoke #unlock - - - - - 1 changed file: - src/main/java/org/onehippo/cms7/services/lock/LockManager.java Changes: = src/main/java/org/onehippo/cms7/services/lock/LockManager.java = --- a/src/main/java/org/onehippo/cms7/services/lock/LockManager.java +++ b/src/main/java/org/onehippo/cms7/services/lock/LockManager.java @@ -39,7 +39,7 @@ public interface LockManager { * a safeguard against a lock being kept by a cluster node that died / has been stopped * * - * A lock is released when {@link #unlock(String)} is invoked as many times as + * A lock is released when a successful {@link #unlock(String)} is invoked as many times as * {@link #lock(String)}. Alternatively, when the {@link LockManager} implementation detects that the Thread * that held the lock is not live any more, the {@link LockManager} implementation can also release the lock. * Lastly, in a database setup, a lock will be released when it has not been refreshed for 60 seconds, @@ -78,14 +78,14 @@ public interface LockManager { void lock(String key, int refreshRateSeconds) throws LockException; /** - * @param key the key to unlock where {@code key} is at most 256 chars. If there exists no lock for {@code key}, a - *{link LockException} is thrown. If there is a {@link Lock} but it cannot be released (for example because not owned) a - *{@link LockException} is thrown - * @throws LockException in case no {@link Lock} exists or in case a {@link Lock} exists for {@code key} - * but could not be released or some other exception happened + * @param key the key to unlock where {@code key} is at most 256 chars. If the {@link Thread} that invokes + * {@link #unlock(String) unlock(key)} does not hold the {@link Lock}, nothing happens (apart from + *the {@link LockManager} implementation most likely logging a warning or error, because it is an + *implementation issue if {@code unlock(key)} is invoked by a thread that does not hold the lock. * @throws IllegalArgumentException if the {@code key} exceeds 256 chars + * @throws RuntimeException in case some error occurs. */ -void unlock(String key) throws LockException; +void unlock(String key); /** * @@ -95,16 +95,16 @@ public interface LockManager { * * @param key the {@code key} to check whether there is a lock for * @return {@code true} when locked - * @throws LockException in case some error occurs. + * @throws RuntimeException in case some error occurs. */ -boolean isLocked(String key) throws LockException; +boolean isLocked(String key); /** * @return all the {@link Lock}s that are currently active (including locks that are marked to be aborted but not * yet aborted) - * @throws LockException in case some error occurs + * @throws RuntimeException in case some error occurs. */ -List getLocks() throws LockException; +List getLocks(); /** * @@ -122,9 +122,10 @@ public interface LockManager { * If there is no {@link Lock} for {@code key}, nothing happens and void is returned. * * @param key the {@code key} to check whether there is a lock for - * @throws LockException in case some error occurs. + * @throws IllegalArgumentException if the {@code key} exceeds 256 chars + * @throws RuntimeException in case some error occurs. */ -void abort(String key) throws LockException; +void abort(String key); } View it on GitLab: https://code.onehippo.org/cms-community/hippo-services-api/commit/669db6800d5ada134218d83e0df20559ceecfcdd --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-services-api/commit/669db6800d5ada134218d83e0df20559ceecfcdd You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/projectdocs] 2 commits: CHANNELMGR-1439 Use the new API for getting/setting active project
Michiel Eggermont pushed to branch feature/projectdocs at cms-community / hippo-addon-channel-manager Commits: 1439bb22 by Michiel Eggermont at 2017-09-27T15:27:40+02:00 CHANNELMGR-1439 Use the new API for getting/setting active project - - - - - dce46f23 by Michiel Eggermont at 2017-09-27T15:33:18+02:00 CHANNELMGR-1439 Rename method - - - - - 3 changed files: - frontend-ng/src/app/channel/channel.service.js - frontend-ng/src/app/services/project.service.js - frontend-ng/src/app/services/project.service.spec.js Changes: = frontend-ng/src/app/channel/channel.service.js = --- a/frontend-ng/src/app/channel/channel.service.js +++ b/frontend-ng/src/app/channel/channel.service.js @@ -72,7 +72,7 @@ class ChannelService { if (this.ConfigService.projectsEnabled) { setupPromise = this.$q -.when(passedProjectId || this.ProjectService.getCurrentProject(channel.mountId)) +.when(passedProjectId || this.ProjectService.getActiveProject()) .then((selectedProjectId) => { if (selectedProjectId && selectedProjectId !== 'master') { channelId = channelId.replace(/-preview$/, `-${selectedProjectId}-preview`); = frontend-ng/src/app/services/project.service.js = --- a/frontend-ng/src/app/services/project.service.js +++ b/frontend-ng/src/app/services/project.service.js @@ -20,7 +20,6 @@ class ProjectService { $http, $q, ConfigService, -HstService, HippoGlobal, ) { 'ngInject'; @@ -29,7 +28,6 @@ class ProjectService { this.$q = $q; this.ConfigService = ConfigService; -this.HstService = HstService; this.HippoGlobal = HippoGlobal; } @@ -50,9 +48,10 @@ class ProjectService { return channel && channel.branchOf ? channel.branchOf : channelId; } - getCurrentProject(mountId = this.mountId) { -return this.HstService - .doGet(mountId, 'currentbranch') + getActiveProject() { +const url = `${this.ConfigService.getCmsContextPath()}ws/projects/activeProject`; +return this.$http + .get(url) .then(result => result.data); } @@ -132,13 +131,15 @@ class ProjectService { } _selectProject(projectId) { -return this.HstService - .doPut(null, this.mountId, 'selectbranch', projectId); +const url = `${this.ConfigService.getCmsContextPath()}ws/projects/activeProject/${projectId}`; +return this.$http + .put(url); } _selectCore() { -return this.HstService - .doPut(null, this.mountId, 'selectmaster'); +const url = `${this.ConfigService.getCmsContextPath()}ws/projects/activeProject`; +return this.$http + .delete(url); } } = frontend-ng/src/app/services/project.service.spec.js = --- a/frontend-ng/src/app/services/project.service.spec.js +++ b/frontend-ng/src/app/services/project.service.spec.js @@ -17,9 +17,7 @@ describe('ProjectService', () => { let $httpBackend; - let $q; let ConfigService; - let HstService; let ProjectService; const mountId = '12'; @@ -63,27 +61,21 @@ describe('ProjectService', () => { inject(( _$httpBackend_, - _$q_, _ConfigService_, _HstService_, _ProjectService_, ) => { $httpBackend = _$httpBackend_; - $q = _$q_; ConfigService = _ConfigService_; - HstService = _HstService_; ProjectService = _ProjectService_; }); spyOn(ConfigService, 'getCmsContextPath').and.returnValue('/test/'); -spyOn(HstService, 'doPut'); -spyOn(HstService, 'doGet'); $httpBackend.expectGET(`/test/ws/projects/${mountId}/associated-with-channel`).respond(200, projects); $httpBackend.expectGET('/test/ws/channels/').respond(200, channels); -HstService.doGet.and.returnValue($q.resolve({ data: currentProject.id })); -HstService.doPut.and.returnValue($q.resolve()); + $httpBackend.expectPUT(`/test/ws/projects/activeProject/${currentProject.id}`).respond(200, currentProject.id); ProjectService.load(mountId, currentProject.id); $httpBackend.flush(); @@ -100,16 +92,12 @@ describe('ProjectService', () => { }); it('selects the core if the selectedProject is not a project', () => { -HstService.doPut.calls.reset(); +$httpBackend.expectDELETE('/test/ws/projects/activeProject').respond(200, currentProject.id); ProjectService.updateSelectedProject('something'); - -expect(HstService.doPut).toHaveBeenCalledWith(null, mountId, 'selectmaster'); }); it('calls setproject if the selectedProject is a project', () => { -HstService.doPut.calls.reset(); + $httpBackend.expectPUT(`/test/ws/projects/activeProject/${projects[1].id}`).respond(200, currentProject.id); ProjectService.updateSelectedProject(projects[1].id); - -expect(HstService
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-1491
Mathijs den Burger pushed new branch bugfix/CHANNELMGR-1491 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1491 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/REPO-1811-2] REPO-1811 Fix test to have flexible logger node test
Ard Schrijvers pushed to branch feature/REPO-1811-2 at cms-community / hippo-repository Commits: 547542ef by Ard Schrijvers at 2017-09-27T16:29:14+02:00 REPO-1811 Fix test to have flexible logger node test - - - - - 2 changed files: - modules/src/main/java/org/hippoecm/repository/logging/RepositoryLogger.java - test/src/test/java/org/hippoecm/repository/logging/RepositoryLoggerTest.java Changes: = modules/src/main/java/org/hippoecm/repository/logging/RepositoryLogger.java = --- a/modules/src/main/java/org/hippoecm/repository/logging/RepositoryLogger.java +++ b/modules/src/main/java/org/hippoecm/repository/logging/RepositoryLogger.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 Hippo B.V. (http://www.onehippo.com) + * Copyright 2012-2017 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ public class RepositoryLogger implements DaemonModule { if (!rootLogFolder.isNodeType("hippolog:folder")) { throw new RepositoryException("Root log folder is not of the expected type"); } -String clusterId = getClusterNodeId(); +String clusterId = getClusterNodeId(session); if (rootLogFolder.hasNode(clusterId)) { logFolder = rootLogFolder.getNode(clusterId); } else { @@ -188,7 +188,7 @@ public class RepositoryLogger implements DaemonModule { } -private String getClusterNodeId() { +static String getClusterNodeId(final Session session) { String clusterNodeId = session.getRepository().getDescriptor("jackrabbit.cluster.id"); if (clusterNodeId == null) { clusterNodeId = DEFAULT_CLUSTER_NODE_ID; = test/src/test/java/org/hippoecm/repository/logging/RepositoryLoggerTest.java = --- a/test/src/test/java/org/hippoecm/repository/logging/RepositoryLoggerTest.java +++ b/test/src/test/java/org/hippoecm/repository/logging/RepositoryLoggerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2012-2017 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ public class RepositoryLoggerTest extends RepositoryTestCase { public void testCreateRepositoryLogger() throws Exception { final RepositoryLogger repositoryLogger = new RepositoryLogger(); repositoryLogger.initialize(session); -assertTrue(session.itemExists("/hippo:log/default")); +assertTrue(session.itemExists("/hippo:log/" + RepositoryLogger.getClusterNodeId(session))); } @Test View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/547542ef06ff69322da19789469e315f36033436 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/547542ef06ff69322da19789469e315f36033436 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [onehippo/urlrewritefilter] 5aa0e8: - formatting
Branch: refs/heads/urlrewritefilter-4.0.x Home: https://github.com/onehippo/urlrewritefilter Commit: 5aa0e8fbd71e53269ac69ffa85a1ea1426170529 https://github.com/onehippo/urlrewritefilter/commit/5aa0e8fbd71e53269ac69ffa85a1ea1426170529 Author: Marijan Milicevic Date: 2017-09-27 (Wed, 27 Sep 2017) Changed paths: M src/test/java/org/tuckey/web/filters/urlrewrite/utils/ValidationUtilsTest.java Log Message: --- - formatting ___ 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-4089 Bump project version to 29.2-SNAPSHOT
Arent-Jan Banck pushed to branch master at cms-community / hippo-site-toolkit Commits: b1e2f2da by Arent-Jan Banck at 2017-09-27T15:37:48+02:00 HSTTWO-4089 Bump project version to 29.2-SNAPSHOT - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.onehippo.cms7 hippo-cms7-project -29 +29.2-SNAPSHOT Hippo Site Toolkit View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/b1e2f2da08be4a96f340fbae549b4ff6271dd4ae --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/b1e2f2da08be4a96f340fbae549b4ff6271dd4ae You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [onehippo/urlrewritefilter] 95a090: - add utility class
Branch: refs/heads/urlrewritefilter-4.0.x Home: https://github.com/onehippo/urlrewritefilter Commit: 95a0905f373e8aee8eaa75a00c279b23c226413c https://github.com/onehippo/urlrewritefilter/commit/95a0905f373e8aee8eaa75a00c279b23c226413c Author: Marijan Milicevic Date: 2017-09-27 (Wed, 27 Sep 2017) Changed paths: M src/main/java/org/tuckey/web/filters/urlrewrite/gzip/GenericResponseWrapper.java A src/main/java/org/tuckey/web/filters/urlrewrite/utils/ValidationUtils.java A src/test/java/org/tuckey/web/filters/urlrewrite/utils/ValidationUtilsTest.java Log Message: --- - add utility class ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [onehippo/urlrewritefilter] ae2a56: - remove redundant null check
Branch: refs/heads/urlrewritefilter-4.0.x Home: https://github.com/onehippo/urlrewritefilter Commit: ae2a56e5d6879bcde6c5887bbb794a34d77b25cb https://github.com/onehippo/urlrewritefilter/commit/ae2a56e5d6879bcde6c5887bbb794a34d77b25cb Author: Marijan Milicevic Date: 2017-09-27 (Wed, 27 Sep 2017) Changed paths: M src/main/java/org/tuckey/web/filters/urlrewrite/Run.java M src/main/java/org/tuckey/web/filters/urlrewrite/Status.java Log Message: --- - remove redundant null check - close input stream after usage ___ 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/projectdocs
Michiel Eggermont pushed new branch feature/projectdocs at cms-community / hippo-site-toolkit --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/tree/feature/projectdocs You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/REPO-1811-2] REPO-1811 only run expires db lock test in integration test
Ard Schrijvers pushed to branch feature/REPO-1811-2 at cms-community / hippo-repository Commits: 79490e41 by Ard Schrijvers at 2017-09-27T14:21:05+02:00 REPO-1811 only run expires db lock test in integration test - - - - - 1 changed file: - test/pom.xml Changes: = test/pom.xml = --- a/test/pom.xml +++ b/test/pom.xml @@ -158,6 +158,7 @@ **/LockTest.java **/LockManagerAbortTest.java **/LockManagerBasicTest.java +**/LockManagerExpiresTest.java **/LockManagerRefreshTest.java @@ -201,6 +202,7 @@ **/LockTest.java **/LockManagerAbortTest.java **/LockManagerBasicTest.java +**/LockManagerExpiresTest.java **/LockManagerRefreshTest.java View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/79490e4102f9b56d635c981dd6d9440ff8e0a793 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/79490e4102f9b56d635c981dd6d9440ff8e0a793 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1444] CHANNELMGR-1444 Add more configuration options
Ran Shem Tov pushed to branch feature/CHANNELMGR-1444 at cms-community / hippo-addon-channel-manager Commits: e68c6996 by Ran ShemTov at 2017-09-27T14:07:42+02:00 CHANNELMGR-1444 Add more configuration options - - - - - 1 changed file: - frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js Changes: = frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js = --- a/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js +++ b/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js @@ -278,7 +278,7 @@ class OverlayService { this._addContentLinkClickHandler(structureElement, overlayElement); break; case 'manage-content-link': -this._initManageContentLink(structureElement, overlayElement); +this._initManageContentLink(structureElement, overlayElement, addContentSvg); break; case 'menu-link': this._addLinkMarkup(overlayElement, menuLinkSvg, 'EDIT_MENU', 'qa-menu-link'); @@ -324,12 +324,14 @@ class OverlayService { overlayElement.append(svg); } - _initManageContentLink(structureElement, overlayElement) { -const initialIcon = addContentSvg; + _initManageContentLink(structureElement, overlayElement, svg, preventCloseIcon) { +const buttonClosedStateIcon = svg; +let buttonOpenStateIcon = clear; +if (preventCloseIcon) buttonOpenStateIcon = svg; overlayElement .addClass('hippo-overlay-element-link hippo-fab-dial-container') - .append(`${initialIcon}`) + .append(`${buttonClosedStateIcon}`) .append(''); const VISIBLE_CLASS = 'is-showing-options'; @@ -339,7 +341,7 @@ class OverlayService { const processClick = (evt) => { overlayElement.on('mouseleave', () => overlayElement.on('mouseenter', showOpts)); if (e !== evt) { - fabBtn.removeClass(BTN_OPEN_CLASS).html(initialIcon); + fabBtn.removeClass(BTN_OPEN_CLASS).html(buttonClosedStateIcon); overlayElement.removeClass(VISIBLE_CLASS); overlayElement.IS_SHOWING = false; overlayElement.off('click mouseleave', processClick); @@ -348,7 +350,7 @@ class OverlayService { if (!overlayElement.IS_SHOWING) { overlayElement.find('.hippo-fab-dial-options').html(this.__initManageContentLinkOptions(structureElement, overlayElement, this.dialButtonsConfig)); overlayElement.IS_SHOWING = true; -fabBtn.html(clear).addClass(BTN_OPEN_CLASS); +fabBtn.html(buttonOpenStateIcon).addClass(BTN_OPEN_CLASS); overlayElement.addClass(VISIBLE_CLASS); overlayElement.on('click mouseleave', processClick); overlayElement.off('mouseenter', showOpts); View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/e68c6996c011be57e183f355b7729e58ddce527b --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/e68c6996c011be57e183f355b7729e58ddce527b You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/REPO-1811-2] REPO-1811 Tests to confirm lock expiration
Ard Schrijvers pushed to branch feature/REPO-1811-2 at cms-community / hippo-repository Commits: c2284223 by Ard Schrijvers at 2017-09-27T14:01:46+02:00 REPO-1811 Tests to confirm lock expiration Integration tests that confirm the correct working of the DbResetExpiredLocksJanitor - - - - - 4 changed files: - test/pom.xml - test/src/test/java/org/onehippo/repository/lock/AbstractLockManagerTest.java - + test/src/test/java/org/onehippo/repository/lock/LockManagerExpiresTest.java - test/src/test/java/org/onehippo/repository/lock/LockManagerRefreshTest.java Changes: = test/pom.xml = --- a/test/pom.xml +++ b/test/pom.xml @@ -156,7 +156,9 @@ **/SchedulerTest.java **/MonkeyTest.java **/LockTest.java -**/LockManagerTest.java +**/LockManagerAbortTest.java +**/LockManagerBasicTest.java +**/LockManagerRefreshTest.java @@ -197,7 +199,9 @@ **/SchedulerTest.java **/MonkeyTest.java **/LockTest.java -**/LockManagerTest.java +**/LockManagerAbortTest.java +**/LockManagerBasicTest.java +**/LockManagerRefreshTest.java = test/src/test/java/org/onehippo/repository/lock/AbstractLockManagerTest.java = --- a/test/src/test/java/org/onehippo/repository/lock/AbstractLockManagerTest.java +++ b/test/src/test/java/org/onehippo/repository/lock/AbstractLockManagerTest.java @@ -139,4 +139,20 @@ public abstract class AbstractLockManagerTest extends RepositoryTestCase { } +protected void insertDataRowLock(final String key, final String clusterId, final String threadName, + final long expirationTime) throws SQLException { +final long lockTime = System.currentTimeMillis(); +try (Connection connection = dataSource.getConnection()){ +final PreparedStatement createStatement = connection.prepareStatement(CREATE_STATEMENT); +createStatement.setString(1, key); +createStatement.setString(2, clusterId); +createStatement.setString(3, threadName); +createStatement.setLong(4, lockTime); +createStatement.setInt(5, 60); +createStatement.setLong(6, expirationTime); +createStatement.execute(); +} +} + + } = test/src/test/java/org/onehippo/repository/lock/LockManagerExpiresTest.java = --- /dev/null +++ b/test/src/test/java/org/onehippo/repository/lock/LockManagerExpiresTest.java @@ -0,0 +1,61 @@ +/* + * Copyright 2017 Hippo B.V. (http://www.onehippo.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.onehippo.repository.lock; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +import org.junit.Test; +import org.onehippo.cms7.services.lock.LockException; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.onehippo.repository.lock.db.DbLockManager.ABORT_STATEMENT; + +public class LockManagerExpiresTest extends AbstractLockManagerTest { + + +@Test +public void an_expired_lock_gets_freed() throws Exception { +if (dataSource == null) { +// in memory test +return; +} +long expirationTime = System.currentTimeMillis() + 6000; +insertDataRowLock("123", "otherClusterNode", "otherThread", expirationTime); + +// Since the lock is of another cluster node which is not live, the lock does not get refreshed meaning it +// will be freed after expiration time + +// within 15 seconds the lock should for sure be freed +while (System.currentTimeMillis() < expirationTime + 15000) { +try { +dbRowAssertion("123", "FREE"); +break; +} catch (AssertionError e) { +// status not yet free, retry +} +} + +// the lock should be free +dbRowAssertion("123", "
[HippoCMS-scm] [onehippo/urlrewritefilter] c5c661: - add repositories
Branch: refs/heads/urlrewritefilter-4.0.x Home: https://github.com/onehippo/urlrewritefilter Commit: c5c661511c53f1ca7e4e6bdc69135adb330c91cf https://github.com/onehippo/urlrewritefilter/commit/c5c661511c53f1ca7e4e6bdc69135adb330c91cf Author: Marijan Milicevic Date: 2017-09-27 (Wed, 27 Sep 2017) Changed paths: M pom.xml M src/main/java/org/tuckey/web/filters/urlrewrite/Conf.java M src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite4.0.dtd Log Message: --- - add repositories - change DTD: drop-cookies is "false" by default ___ 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][release/12.0] ARCHE-561 Remove buildnumber-maven-plugin from repository data sub-projects
Arent-Jan Banck pushed to branch release/12.0 at cms-community / hippo-project-archetype Commits: f2aa9535 by Arent-Jan Banck at 2017-09-27T13:38:06+02:00 ARCHE-561 Remove buildnumber-maven-plugin from repository data sub-projects - - - - - 2 changed files: - src/main/resources/archetype-resources/repository-data/application/pom.xml - src/main/resources/archetype-resources/repository-data/development/pom.xml Changes: = src/main/resources/archetype-resources/repository-data/application/pom.xml = --- a/src/main/resources/archetype-resources/repository-data/application/pom.xml +++ b/src/main/resources/archetype-resources/repository-data/application/pom.xml @@ -16,10 +16,6 @@ install -org.codehaus.mojo -buildnumber-maven-plugin - - org.apache.maven.plugins maven-jar-plugin = src/main/resources/archetype-resources/repository-data/development/pom.xml = --- a/src/main/resources/archetype-resources/repository-data/development/pom.xml +++ b/src/main/resources/archetype-resources/repository-data/development/pom.xml @@ -16,10 +16,6 @@ install -org.codehaus.mojo -buildnumber-maven-plugin - - org.apache.maven.plugins maven-jar-plugin View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/commit/f2aa95358ae714aaf3cc881283ce490021a77d73 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/commit/f2aa95358ae714aaf3cc881283ce490021a77d73 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype][master] ARCHE-559 Remove buildnumber-maven-plugin from repository data sub-projects
Arent-Jan Banck pushed to branch master at cms-community / hippo-project-archetype Commits: 74af0432 by Arent-Jan Banck at 2017-09-27T12:35:18+02:00 ARCHE-559 Remove buildnumber-maven-plugin from repository data sub-projects - - - - - 2 changed files: - src/main/resources/archetype-resources/repository-data/application/pom.xml - src/main/resources/archetype-resources/repository-data/development/pom.xml Changes: = src/main/resources/archetype-resources/repository-data/application/pom.xml = --- a/src/main/resources/archetype-resources/repository-data/application/pom.xml +++ b/src/main/resources/archetype-resources/repository-data/application/pom.xml @@ -16,10 +16,6 @@ install -org.codehaus.mojo -buildnumber-maven-plugin - - org.apache.maven.plugins maven-jar-plugin = src/main/resources/archetype-resources/repository-data/development/pom.xml = --- a/src/main/resources/archetype-resources/repository-data/development/pom.xml +++ b/src/main/resources/archetype-resources/repository-data/development/pom.xml @@ -16,10 +16,6 @@ install -org.codehaus.mojo -buildnumber-maven-plugin - - org.apache.maven.plugins maven-jar-plugin View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/commit/74af043264f19c1fdda29b7815ecde17dd177601 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/commit/74af043264f19c1fdda29b7815ecde17dd177601 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1444] CHANNELMGR-1444 Fix buttons direction to follow the same convention both upwards and downwards
Ran Shem Tov pushed to branch feature/CHANNELMGR-1444 at cms-community / hippo-addon-channel-manager Commits: c586934c by Ran ShemTov at 2017-09-27T12:48:22+02:00 CHANNELMGR-1444 Fix buttons direction to follow the same convention both upwards and downwards - - - - - 1 changed file: - frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js Changes: = frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js = --- a/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js +++ b/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js @@ -326,11 +326,11 @@ class OverlayService { _initManageContentLink(structureElement, overlayElement) { const initialIcon = addContentSvg; -const buttons = this.__initManageContentLinkOptions(structureElement, overlayElement, this.dialButtonsConfig); overlayElement .addClass('hippo-overlay-element-link hippo-fab-dial-container') - .append(`${initialIcon}`); + .append(`${initialIcon}`) + .append(''); const VISIBLE_CLASS = 'is-showing-options'; const BTN_OPEN_CLASS = 'hippo-fab-btn-open'; @@ -346,7 +346,7 @@ class OverlayService { } }; if (!overlayElement.IS_SHOWING) { -overlayElement.append(buttons); + overlayElement.find('.hippo-fab-dial-options').html(this.__initManageContentLinkOptions(structureElement, overlayElement, this.dialButtonsConfig)); overlayElement.IS_SHOWING = true; fabBtn.html(clear).addClass(BTN_OPEN_CLASS); overlayElement.addClass(VISIBLE_CLASS); @@ -359,7 +359,6 @@ class OverlayService { } __initManageContentLinkOptions(structureElement, overlayElement, config) { -const optionsContainer = $(''); let buttons = []; Object.keys(config).forEach((i) => { const button = config[i]; @@ -374,7 +373,7 @@ class OverlayService { buttons = this._adjustButtonsPosition(structureElement, overlayElement, buttons); }); -return optionsContainer.html(buttons); +return buttons; } _adjustButtonsPosition(structureElement, overlayElement, buttons) { @@ -388,8 +387,8 @@ class OverlayService { const scrollBottom = viewHeight + scrollTop; const buttonsByDirection = { - top: buttons.slice().reverse(), - bottom: buttons.slice(), + top: buttons.slice(), + bottom: buttons.slice().reverse(), }; const setButtonsDirection = (direction) => { @@ -401,11 +400,8 @@ class OverlayService { return buttonsByDirection[direction]; }; -if (scrollTop > (top - 80)) { - return setButtonsDirection('bottom'); -} else if (scrollBottom < (top + 130)) { - return setButtonsDirection('top'); -} +if (scrollTop > (top - 80)) return setButtonsDirection('bottom'); +else if (scrollBottom < (top + 130)) return setButtonsDirection('top'); return setButtonsDirection('bottom'); } View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/c586934c455c4b65d98ef491679635f21f90515a --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/c586934c455c4b65d98ef491679635f21f90515a You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1444] CHANNELMGR-1444 Fix functionality to enable button open/close both on hover and click
Ran Shem Tov pushed to branch feature/CHANNELMGR-1444 at cms-community / hippo-addon-channel-manager Commits: fbed6f62 by Ran ShemTov at 2017-09-27T12:36:15+02:00 CHANNELMGR-1444 Fix functionality to enable button open/close both on hover and click - - - - - 2 changed files: - frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js - frontend-ng/src/styles/string/hippo-iframe.scss Changes: = frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js = --- a/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js +++ b/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js @@ -60,8 +60,8 @@ class OverlayService { PageStructureService.registerChangeListener(() => this.sync()); this.dialButtonsConfig = { - 0: { svg: plus, callback: console.log }, - 1: { svg: search, callback: console.log }, + 0: { svg: plus, callback: console.log, tooltip: 'create content' }, + 1: { svg: search, callback: console.log, tooltip: 'edit content' }, }; } @@ -330,29 +330,32 @@ class OverlayService { overlayElement .addClass('hippo-overlay-element-link hippo-fab-dial-container') - .append(`${initialIcon}`) - .append(buttons); + .append(`${initialIcon}`); const VISIBLE_CLASS = 'is-showing-options'; const BTN_OPEN_CLASS = 'hippo-fab-btn-open'; const fabBtn = overlayElement.find('#hippo-fab-btn'); const showOpts = (e) => { const processClick = (evt) => { +overlayElement.on('mouseleave', () => overlayElement.on('mouseenter', showOpts)); if (e !== evt) { fabBtn.removeClass(BTN_OPEN_CLASS).html(initialIcon); overlayElement.removeClass(VISIBLE_CLASS); overlayElement.IS_SHOWING = false; - fabBtn.off('click', processClick); + overlayElement.off('click mouseleave', processClick); } }; if (!overlayElement.IS_SHOWING) { +overlayElement.append(buttons); overlayElement.IS_SHOWING = true; fabBtn.html(clear).addClass(BTN_OPEN_CLASS); overlayElement.addClass(VISIBLE_CLASS); -fabBtn.on('click', processClick); +overlayElement.on('click mouseleave', processClick); +overlayElement.off('mouseenter', showOpts); } }; -fabBtn.on('click', showOpts); +overlayElement.on('click mouseenter', showOpts); +overlayElement.on('click', '.hippo-fab-dial-options > button', () => overlayElement.trigger('mouseleave')); } __initManageContentLinkOptions(structureElement, overlayElement, config) { @@ -360,7 +363,7 @@ class OverlayService { let buttons = []; Object.keys(config).forEach((i) => { const button = config[i]; - const tpl = $(`${button.svg}`) + const tpl = $(`${button.svg}`) .addClass(`hippo-fab-option-btn hippo-fab-option-${i}`) .on('click', () => button.callback(i)); buttons.push(tpl); @@ -371,7 +374,7 @@ class OverlayService { buttons = this._adjustButtonsPosition(structureElement, overlayElement, buttons); }); -return optionsContainer.html(buttons.reverse()); +return optionsContainer.html(buttons); } _adjustButtonsPosition(structureElement, overlayElement, buttons) { @@ -385,8 +388,8 @@ class OverlayService { const scrollBottom = viewHeight + scrollTop; const buttonsByDirection = { - top: buttons.slice(), - bottom: buttons.slice().reverse(), + top: buttons.slice().reverse(), + bottom: buttons.slice(), }; const setButtonsDirection = (direction) => { = frontend-ng/src/styles/string/hippo-iframe.scss = --- a/frontend-ng/src/styles/string/hippo-iframe.scss +++ b/frontend-ng/src/styles/string/hippo-iframe.scss @@ -317,7 +317,7 @@ } &.hippo-bottom .hippo-fab-dial-options { bottom: initial; -margin-top: 5px; +padding-top: 5px; top: 100%; } .hippo-fab-dial-options button { View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/fbed6f62e5c3ccb219113f564accf39f5311bc48 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/fbed6f62e5c3ccb219113f564accf39f5311bc48 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype] Pushed new branch bugfix/ARCHE-559
Arent-Jan Banck pushed new branch bugfix/ARCHE-559 at cms-community / hippo-project-archetype --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/tree/bugfix/ARCHE-559 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-l10n-tooling][release/2.0] CMS-16 bump to latest hcm
Ate Douma pushed to branch release/2.0 at cms-community / hippo-cms-l10n-tooling Commits: e754487b by Ate Douma at 2017-09-27T10:43:41+02:00 CMS-16 bump to latest hcm - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 1.4 2.4 3.16 - 1.0.1 + 1.0.2-SNAPSHOT 4.10 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-l10n-tooling/commit/e754487b96757c0407bcf4702a004e192fd7da8e --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-l10n-tooling/commit/e754487b96757c0407bcf4702a004e192fd7da8e You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/projectdocs
Michiel Eggermont pushed new branch feature/projectdocs at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/projectdocs You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn