[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CC-CHANNELMGR-1483
Mathijs den Burger pushed new branch feature/CC-CHANNELMGR-1483 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CC-CHANNELMGR-1483 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10839
Jeroen Hoffman deleted branch bugfix/CMS-10839 at cms-community / hippo-cms --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 4 commits: CMS-10839 field styling
Jeroen Hoffman pushed to branch master at cms-community / hippo-cms Commits: 5fc92b30 by Bert Leunis at 2017-09-28T16:42:21+02:00 CMS-10839 field styling - - - - - 3427df93 by Bert Leunis at 2017-10-05T16:15:33+02:00 CMS-10839 narrow down the styling of checkbox and label to only this plugin - - - - - 4ecd5b0c by Jeroen Hoffman at 2017-10-19T21:33:08+02:00 CMS-10839 Merge branch master into bugfix/CMS-10839 - - - - - 40ce3065 by Jeroen Hoffman at 2017-10-20T15:54:29+02:00 CMS-10839 Reintegrate branch bugfix/CMS-10839 to master - - - - - 2 changed files: - api/src/main/styling/styles/_editor.scss - editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html Changes: = api/src/main/styling/styles/_editor.scss = --- a/api/src/main/styling/styles/_editor.scss +++ b/api/src/main/styling/styles/_editor.scss @@ -114,6 +114,10 @@ width: auto; } + .hippo-editor-field-boolean > input[type="checkbox"] + label { +margin-left: 8px; + } + input[type="submit"] { width: auto; } = editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html = --- a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html +++ b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html @@ -1,5 +1,5 @@ http://wicket.apache.org/;> - + - [ mixin ] + + [ mixin ] + View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/182a4325ae337bae840c65cb7c759075ecb6a2cb...40ce3065373b56eff4b58f861444b7d19cc5b074 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/182a4325ae337bae840c65cb7c759075ecb6a2cb...40ce3065373b56eff4b58f861444b7d19cc5b074 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/projectdocs] REPO-1870 Avoid long stacktraces being logged by default
Ard Schrijvers pushed to branch feature/projectdocs at cms-community / hippo-repository Commits: 60c56890 by Ard Schrijvers at 2017-10-20T13:56:34+02:00 REPO-1870 Avoid long stacktraces being logged by default When hitting a non existing endpoint, or an endpoint with the wrong method, by default, a long stacktrace is logged. By default, we should log a single line warning and in debug level the whole stacktrace. Unfortunately using: final WebApplicationExceptionMapper webApplicationExceptionMapper = new WebApplicationExceptionMapper(); webApplicationExceptionMapper.setPrintStackTrace(false); endpointFactory.setProvider(webApplicationExceptionMapper); doesnt do the job because then nothing is logged any more (unless in FINE log level). Hence extend the WebApplicationExceptionMapper, log a warning and delegate - - - - - 1 changed file: - jaxrs/src/main/java/org/onehippo/repository/jaxrs/RepositoryJaxrsService.java Changes: = jaxrs/src/main/java/org/onehippo/repository/jaxrs/RepositoryJaxrsService.java = --- a/jaxrs/src/main/java/org/onehippo/repository/jaxrs/RepositoryJaxrsService.java +++ b/jaxrs/src/main/java/org/onehippo/repository/jaxrs/RepositoryJaxrsService.java @@ -29,13 +29,17 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Application; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxrs.JAXRSInvoker; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; +import org.apache.cxf.jaxrs.impl.WebApplicationExceptionMapper; import org.apache.cxf.jaxrs.utils.ResourceUtils; import org.apache.cxf.transport.http.AbstractHTTPDestination; import org.apache.cxf.transport.http.DestinationRegistry; @@ -190,6 +194,11 @@ public final class RepositoryJaxrsService { endpointFactory.setAddress(address); endpointFactory.setDestinationFactory(destinationFactory); +// don't print entire stacktraces +final WebApplicationExceptionLogger webApplicationExceptionLogger = new WebApplicationExceptionLogger(); +webApplicationExceptionLogger.setPrintStackTrace(false); +endpointFactory.setProvider(webApplicationExceptionLogger); + CXFRepositoryJaxrsEndpoint cxfEndpoint = endpoint instanceof CXFRepositoryJaxrsEndpoint ? (CXFRepositoryJaxrsEndpoint)endpoint : null; @@ -276,4 +285,18 @@ public final class RepositoryJaxrsService { } } } + + +private static class WebApplicationExceptionLogger extends WebApplicationExceptionMapper { + +@Override +public Response toResponse(final WebApplicationException exception) { +if (log.isDebugEnabled()) { +log.warn(exception.toString(), exception); +} else { +log.warn(exception.toString()); +} +return super.toResponse(exception); +} +} } View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/60c5689068287932769484c03927f6414213778f --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/60c5689068287932769484c03927f6414213778f 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/create-content] CHANNELMGR-1524 Keep active effect for main button when the children (options) are hovered
Ran Shem Tov pushed to branch feature/create-content at cms-community / hippo-addon-channel-manager Commits: 3818a5d5 by Ran ShemTov at 2017-10-20T13:38:39+02:00 CHANNELMGR-1524 Keep active effect for main button when the children (options) are hovered - - - - - 1 changed file: - frontend-ng/src/styles/string/hippo-iframe.scss Changes: = 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 @@ -301,6 +301,10 @@ } } &.is-showing-options { +.hippo-fab-btn { + background-color: darken($overlay-link-bgcolor, 12%); + box-shadow: $overlay-link-shadow-active !important; +} .hippo-fab-dial-options { display: flex; button { View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/3818a5d56f19971c10731870d98fd9701debf5dd --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/3818a5d56f19971c10731870d98fd9701debf5dd You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/CC-CMS-10951
Mathijs den Burger deleted branch feature/CC-CMS-10951 at cms-community / hippo-cms --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository] Deleted branch feature/CC-REPO-1868
Mathijs den Burger deleted branch feature/CC-REPO-1868 at cms-community / hippo-repository --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/create-content] 4 commits: CHANNELMGR-1524 Style changes to adjust to the materials spec
Ran Shem Tov pushed to branch feature/create-content at cms-community / hippo-addon-channel-manager Commits: b386e330 by Ran ShemTov at 2017-10-19T13:40:38+02:00 CHANNELMGR-1524 Style changes to adjust to the materials spec - - - - - e656d42d by Ran ShemTov at 2017-10-20T12:20:34+02:00 CHANNELMGR-1524 Change shadow behaviour according to click or hover - - - - - 1b93f4c1 by Ran ShemTov at 2017-10-20T12:25:53+02:00 CHANNELMGR-1524 Add local variable to the variables file for reusability - - - - - 507f78cf by Ran ShemTov at 2017-10-20T12:29:36+02:00 Merge branch feature/CC-CHANNELMGR-1524 into feature/create-content - - - - - 2 changed files: - frontend-ng/src/styles/_variables.scss - frontend-ng/src/styles/string/hippo-iframe.scss Changes: = frontend-ng/src/styles/_variables.scss = --- a/frontend-ng/src/styles/_variables.scss +++ b/frontend-ng/src/styles/_variables.scss @@ -174,6 +174,10 @@ $overlay-link-transition: 300ms cubic-bezier(.55, 0, .55, .2); $overlay-link-hover-bgcolor: #e06717; $overlay-link-active-shadow-color: rgba(0, 0, 0, .4); $overlay-link-clicked-bgcolor: $orange-a200; +$overlay-link-shadow-color: rgba(0, 0, 0, .3); + +$overlay-link-shadow-active: 1px 3px 8px 2px $overlay-link-shadow-color; +$overlay-link-shadow-hover: 1px 3px 8px 1px $overlay-link-shadow-color; $overlay-icon-fill: $grey-600; $overlay-icon-size: 36px; = 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 @@ -271,6 +271,15 @@ border: 0; fill: $overlay-link-shadow-color; padding-top: 7px; + +&:hover { + background-color: darken($white, 10%); + box-shadow: $overlay-link-shadow-hover !important; +} +&:active { + background-color: darken($white, 10%); + box-shadow: $overlay-link-shadow-active !important; +} } .hippo-fab-btn { @extend %hippo-material-btn; @@ -278,7 +287,14 @@ height: 100%; padding: 8px 0 0 5px; width: 100%; - +&:hover { + background-color: darken($overlay-link-bgcolor, 12%); + box-shadow: $overlay-link-shadow-hover !important; +} +&:active { + background-color: darken($overlay-link-bgcolor, 12%); + box-shadow: $overlay-link-shadow-active !important; +} &-open { padding: 7px 0 0; svg { fill: $white; } View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/39ed3f28cdbdfc18f5dc982c0087c4bf36eb756e...507f78cf74b3ad925002c1010ef4c3f744ca0867 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/39ed3f28cdbdfc18f5dc982c0087c4bf36eb756e...507f78cf74b3ad925002c1010ef4c3f744ca0867 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] Deleted branch feature/CC-CHANNELMGR-1524
Ran Shem Tov deleted branch feature/CC-CHANNELMGR-1524 at cms-community / hippo-addon-channel-manager --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CC-CMS-10951] CMS-10951 Make ServicedStringCodecFactory package-private
Mathijs den Burger pushed to branch feature/CC-CMS-10951 at cms-community / hippo-cms Commits: 98cdfa35 by Mathijs den Burger at 2017-10-20T12:21:24+02:00 CMS-10951 Make ServicedStringCodecFactory package-private No need to expose it more. - - - - - 1 changed file: - engine/src/main/java/org/hippoecm/frontend/service/settings/ServicedStringCodecFactory.java Changes: = engine/src/main/java/org/hippoecm/frontend/service/settings/ServicedStringCodecFactory.java = --- a/engine/src/main/java/org/hippoecm/frontend/service/settings/ServicedStringCodecFactory.java +++ b/engine/src/main/java/org/hippoecm/frontend/service/settings/ServicedStringCodecFactory.java @@ -29,7 +29,7 @@ import org.onehippo.cms7.services.HippoServiceRegistry; /** * String codec factory that delegates the lookup of codecs to the {@link StringCodecService}. */ -public class ServicedStringCodecFactory extends StringCodecFactory { +class ServicedStringCodecFactory extends StringCodecFactory { private static final MapENCODINGS = initEncodings(); View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/98cdfa35321319a6947a95ccb122f1fa74a714cf --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/98cdfa35321319a6947a95ccb122f1fa74a714cf 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/CC-CHANNELMGR-1524
Ran Shem Tov pushed new branch feature/CC-CHANNELMGR-1524 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CC-CHANNELMGR-1524 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/CC-REPO-1868] REPO-1868 Add explicit dependency on hippo-cms-testutils when needed
Mathijs den Burger pushed to branch feature/CC-REPO-1868 at cms-community / hippo-repository Commits: 4d2a8886 by Mathijs den Burger at 2017-10-20T10:57:03+02:00 REPO-1868 Add explicit dependency on hippo-cms-testutils when needed - - - - - 4 changed files: - deprecated/facetselectmirror/pom.xml - jaxrs/pom.xml - test/pom.xml - workflow/pom.xml Changes: = deprecated/facetselectmirror/pom.xml = --- a/deprecated/facetselectmirror/pom.xml +++ b/deprecated/facetselectmirror/pom.xml @@ -88,6 +88,11 @@ ${project.version} test + + org.onehippo.cms7 + hippo-cms-testutils + test + = jaxrs/pom.xml = --- a/jaxrs/pom.xml +++ b/jaxrs/pom.xml @@ -88,6 +88,11 @@ ${project.version} test + + org.onehippo.cms7 + hippo-cms-testutils + test + = test/pom.xml = --- a/test/pom.xml +++ b/test/pom.xml @@ -106,6 +106,11 @@ ${project.version} test + + org.onehippo.cms7 + hippo-cms-testutils + test + = workflow/pom.xml = --- a/workflow/pom.xml +++ b/workflow/pom.xml @@ -99,6 +99,11 @@ test + org.onehippo.cms7 + hippo-cms-testutils + test + + junit junit test View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/4d2a8886b791eeae142b3ebae234f0827f9f3718 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/4d2a8886b791eeae142b3ebae234f0827f9f3718 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][feature/HIPPLUG-1481] HIPPLUG-1481 remove remaining _demo_creation (should've been gone before)
Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / hippo-plugin-poll Commits: bd062bff by Jeroen Hoffman at 2017-10-20T10:41:16+02:00 HIPPLUG-1481 remove remaining _demo_creation (shouldve been gone before) - - - - - 2 changed files: - demo/README.txt - − demo/_demo_creation/import/polldata-polldemo.xml Changes: = demo/README.txt = --- a/demo/README.txt +++ b/demo/README.txt @@ -4,7 +4,7 @@ How to generate a demo project for the Polls feature 1) Generate a project from the archetype. -2) In essentials/pom.xml, add: +2) To demo a custom poll document with title and poll compound, add to essentials/pom.xml: org.onehippo.cms7 @@ -14,8 +14,8 @@ How to generate a demo project for the Polls feature 3) Build && run locally. -- With Essentials, set up with the default settings. - JSP for templating language is not supported for the Polls Demo feature. +- With Essentials, set up the project with the default settings. + Note that JSP for templating language is not supported for the Polls Demo feature. - With Essentials, install Polls feature, then rebuild && run twice ((boarding, installing). = demo/_demo_creation/import/polldata-polldemo.xml deleted = --- a/demo/_demo_creation/import/polldata-polldemo.xml +++ /dev/null @@ -1,92 +0,0 @@ - - -http://www.jcp.org/jcr/sv/1.0; sv:name="polldemo"> - -poll:polldata - - -mix:lockable - - - - poll:polldata - - - mix:lockable - - - -poll:polldata - - -mix:lockable - - - - poll:votes - - - mix:lockable - - - 526 - - - - - poll:votes - - - mix:lockable - - - 119 - - - - - -poll:polldata - - -mix:lockable - - - - poll:votes - - - mix:lockable - - - 64 - - - - - poll:votes - - - mix:lockable - - - 47 - - - - - View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/bd062bff24e8a30f1944bae08a011918528e4107 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/bd062bff24e8a30f1944bae08a011918528e4107 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/CC-REPO-1868] 55 commits: REPO-1811 Implement in-memory lock manager
Mathijs den Burger pushed to branch feature/CC-REPO-1868 at cms-community / hippo-repository Commits: dfa6f279 by Ard Schrijvers at 2017-09-12T15:49:32+02:00 REPO-1811 Implement in-memory lock manager - - - - - 4750450f by Ard Schrijvers at 2017-09-12T23:29:49+02:00 REPO-1811 To the RepositoryImpl add a Journal ConnectionHelper accessor Via this Journal ConnectionHelper we can access the Journal DataSource via the ConnectionHelperDataSourceAccessor. Admittedly, a bit clumsy but we need access to the Journal DataSource because we need to know whether we are dealing with a database *and* whether we have a clustered setup : Only in that case, the lock mechanism has to be upgraded from in memory locking to db base locking because needs to be cluster wide - - - - - e0f19fab by Ard Schrijvers at 2017-09-12T23:33:43+02:00 REPO-1811 Support for a Database lock manager The Database lock manager interaction is pretty much exactly the same as the MemoryLockManager interaction. The biggest difference is that the DbLockManager creates database based locks and the MemoryLockManager creates MemoryLocks. Note that a DbLock is the same as the MemoryLock but only contains a #destroy implementation that releases the database lock. The DbLockManager is still work in progress - - - - - 1dba0d49 by Ard Schrijvers at 2017-09-13T14:44:56+02:00 REPO-1811 Fix the LockClusterTest setup (still ignored but the setup failed since we do not allow SNS below jcr:root any more) - - - - - 92c914ef by Ard Schrijvers at 2017-09-14T14:29:52+02:00 REPO-1811 Support database locking - - - - - cbf14aed by Ard Schrijvers at 2017-09-19T15:16:45+02:00 REPO-1811 Support background jobs in the Memory or Db LockManager - All the background jobs are run by a single thread - By default they run every 5 seconds with an initial delay of 5 seconds - Every background job is wrapped in a synchronized runnable the synchronized on the LockManager instance: The reason for this is that we do not want background jobs to write concurrently to possibly the same records as other (background) jobs - We have the following background jobs: 1) UnlockStoppedThreadJanitor : releases database locks for records that were held by a thread that is not alive any more 2) DbResetExpiredLocksJanitor : Resets all database rows which have expired locks (rows with status RUNNING or ABORT and expirationTime has passed 3) DbLockRefresher: Refreshes the expiresTime of a lock to currentTime + refreshRateSeconds 4) LockThreadInterrupter : Interrupts the Thread that holds the lock that has been marked ABORT - - - - - 441beff4 by Ard Schrijvers at 2017-09-19T16:54:14+02:00 REPO-1811 Make sure getLocks and isLocked works cluster wide in case of a database - - - - - d3d25849 by Ard Schrijvers at 2017-09-20T11:30:29+02:00 REPO-1811 Fix sql statement - - - - - 5ab1e55f by Ard Schrijvers at 2017-09-20T11:33:54+02:00 REPO-1811 Extract abstract test and add an abort test - - - - - 4a939b29 by Ard Schrijvers at 2017-09-20T11:37:27+02:00 REPO-1811 merge from master - - - - - 7027fce3 by Ard Schrijvers at 2017-09-20T13:41:57+02:00 REPO-1811 use getHoldCount() instead of protected access - - - - - 0bf87cb5 by Ard Schrijvers at 2017-09-20T13:42:28+02:00 REPO-1811 improve feedback - - - - - a268b5e6 by Ard Schrijvers at 2017-09-20T13:42:50+02:00 REPO-1811 use getHoldCount() instead of protected access - - - - - dac8d9cc by Ard Schrijvers at 2017-09-20T13:43:20+02:00 REPO-1811 Fix abort statement - - - - - cc3e10d9 by Ard Schrijvers at 2017-09-20T15:02:27+02:00 REPO-1811 Encapsulate the localLocks object Since localLocks is a hashmap, all access to it should be synchronized. This can be easier achieved by encapsulating it and whenever needed by other classes, return a new object containing the same locks - - - - - 43f17029 by Ard Schrijvers at 2017-09-20T15:25:56+02:00 REPO-1811 Enhance abort tests - - - - - 05143edd by Ard Schrijvers at 2017-09-20T17:10:43+02:00 REPO-1811 use auto closable in integration tests - - - - - 62bd68c2 by Ard Schrijvers at 2017-09-20T17:11:14+02:00 REPO-1811 Correct the expiresTime parameter - - - - - f038ec5b by Ard Schrijvers at 2017-09-20T17:13:20+02:00 REPO-1811 Locks in status ABORT should also be refreshed Namely if a lock is in status ABORT and the lock is for the *CLUSTER NODE* on which the DbLockRefresher runs, then it means that on this cluster node the Thread that should be aborted did not yet abort (for example still busy with its job). All we can do is wait until that job finishes - - - - - 591ff099 by Ard Schrijvers at 2017-09-20T17:13:43+02:00 REPO-1811 remove unneeded auto commit - - - - - 8a6b58b3 by Ard Schrijvers at 2017-09-20T17:14:10+02:00 REPO-1811 If a Thread is already interrupted, dont interrupt again - - - - - a3bc5d1f by Ard Schrijvers at 2017-09-20T17:14:41+02:00 REPO-1811 Integration tests that confirm the correct working of the DbLockRefresher - - - - - c2284223 by Ard Schrijvers
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/create-content] REPO-1860 Use master version of hippo-services
Mathijs den Burger pushed to branch feature/create-content at cms-community / hippo-repository Commits: 4945eb33 by Mathijs den Burger at 2017-10-20T10:29:04+02:00 REPO-1860 Use master version of hippo-services Create content does not need a branch of hippo-services after all. - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 2.14.0-h2 1.1.0-SNAPSHOT 4.1.0-SNAPSHOT - 4.1.0-create-content-SNAPSHOT +4.1.0-SNAPSHOT 4.1.0-SNAPSHOT 4.1.0-SNAPSHOT 1.01.06 View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/4945eb33c31a409d40e3b04c28a16d6a9ab57e66 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/4945eb33c31a409d40e3b04c28a16d6a9ab57e66 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/create-content] 53 commits: REPO-1811 Implement in-memory lock manager
Mathijs den Burger pushed to branch feature/create-content at cms-community / hippo-repository Commits: dfa6f279 by Ard Schrijvers at 2017-09-12T15:49:32+02:00 REPO-1811 Implement in-memory lock manager - - - - - 4750450f by Ard Schrijvers at 2017-09-12T23:29:49+02:00 REPO-1811 To the RepositoryImpl add a Journal ConnectionHelper accessor Via this Journal ConnectionHelper we can access the Journal DataSource via the ConnectionHelperDataSourceAccessor. Admittedly, a bit clumsy but we need access to the Journal DataSource because we need to know whether we are dealing with a database *and* whether we have a clustered setup : Only in that case, the lock mechanism has to be upgraded from in memory locking to db base locking because needs to be cluster wide - - - - - e0f19fab by Ard Schrijvers at 2017-09-12T23:33:43+02:00 REPO-1811 Support for a Database lock manager The Database lock manager interaction is pretty much exactly the same as the MemoryLockManager interaction. The biggest difference is that the DbLockManager creates database based locks and the MemoryLockManager creates MemoryLocks. Note that a DbLock is the same as the MemoryLock but only contains a #destroy implementation that releases the database lock. The DbLockManager is still work in progress - - - - - 1dba0d49 by Ard Schrijvers at 2017-09-13T14:44:56+02:00 REPO-1811 Fix the LockClusterTest setup (still ignored but the setup failed since we do not allow SNS below jcr:root any more) - - - - - 92c914ef by Ard Schrijvers at 2017-09-14T14:29:52+02:00 REPO-1811 Support database locking - - - - - cbf14aed by Ard Schrijvers at 2017-09-19T15:16:45+02:00 REPO-1811 Support background jobs in the Memory or Db LockManager - All the background jobs are run by a single thread - By default they run every 5 seconds with an initial delay of 5 seconds - Every background job is wrapped in a synchronized runnable the synchronized on the LockManager instance: The reason for this is that we do not want background jobs to write concurrently to possibly the same records as other (background) jobs - We have the following background jobs: 1) UnlockStoppedThreadJanitor : releases database locks for records that were held by a thread that is not alive any more 2) DbResetExpiredLocksJanitor : Resets all database rows which have expired locks (rows with status RUNNING or ABORT and expirationTime has passed 3) DbLockRefresher: Refreshes the expiresTime of a lock to currentTime + refreshRateSeconds 4) LockThreadInterrupter : Interrupts the Thread that holds the lock that has been marked ABORT - - - - - 441beff4 by Ard Schrijvers at 2017-09-19T16:54:14+02:00 REPO-1811 Make sure getLocks and isLocked works cluster wide in case of a database - - - - - d3d25849 by Ard Schrijvers at 2017-09-20T11:30:29+02:00 REPO-1811 Fix sql statement - - - - - 5ab1e55f by Ard Schrijvers at 2017-09-20T11:33:54+02:00 REPO-1811 Extract abstract test and add an abort test - - - - - 4a939b29 by Ard Schrijvers at 2017-09-20T11:37:27+02:00 REPO-1811 merge from master - - - - - 7027fce3 by Ard Schrijvers at 2017-09-20T13:41:57+02:00 REPO-1811 use getHoldCount() instead of protected access - - - - - 0bf87cb5 by Ard Schrijvers at 2017-09-20T13:42:28+02:00 REPO-1811 improve feedback - - - - - a268b5e6 by Ard Schrijvers at 2017-09-20T13:42:50+02:00 REPO-1811 use getHoldCount() instead of protected access - - - - - dac8d9cc by Ard Schrijvers at 2017-09-20T13:43:20+02:00 REPO-1811 Fix abort statement - - - - - cc3e10d9 by Ard Schrijvers at 2017-09-20T15:02:27+02:00 REPO-1811 Encapsulate the localLocks object Since localLocks is a hashmap, all access to it should be synchronized. This can be easier achieved by encapsulating it and whenever needed by other classes, return a new object containing the same locks - - - - - 43f17029 by Ard Schrijvers at 2017-09-20T15:25:56+02:00 REPO-1811 Enhance abort tests - - - - - 05143edd by Ard Schrijvers at 2017-09-20T17:10:43+02:00 REPO-1811 use auto closable in integration tests - - - - - 62bd68c2 by Ard Schrijvers at 2017-09-20T17:11:14+02:00 REPO-1811 Correct the expiresTime parameter - - - - - f038ec5b by Ard Schrijvers at 2017-09-20T17:13:20+02:00 REPO-1811 Locks in status ABORT should also be refreshed Namely if a lock is in status ABORT and the lock is for the *CLUSTER NODE* on which the DbLockRefresher runs, then it means that on this cluster node the Thread that should be aborted did not yet abort (for example still busy with its job). All we can do is wait until that job finishes - - - - - 591ff099 by Ard Schrijvers at 2017-09-20T17:13:43+02:00 REPO-1811 remove unneeded auto commit - - - - - 8a6b58b3 by Ard Schrijvers at 2017-09-20T17:14:10+02:00 REPO-1811 If a Thread is already interrupted, dont interrupt again - - - - - a3bc5d1f by Ard Schrijvers at 2017-09-20T17:14:41+02:00 REPO-1811 Integration tests that confirm the correct working of the DbLockRefresher - - - - - c2284223 by Ard
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][feature/HIPPLUG-1481] HIPPLUG-1481 in README, describe what the feature does.
Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / hippo-plugin-poll Commits: 592743a2 by Jeroen Hoffman at 2017-10-20T10:25:21+02:00 HIPPLUG-1481 in README, describe what the feature does. - - - - - 1 changed file: - essentials-demo-feature/README.txt Changes: = essentials-demo-feature/README.txt = --- a/essentials-demo-feature/README.txt +++ b/essentials-demo-feature/README.txt @@ -1,6 +1,9 @@ Hippo Essentials Plugin Feature === -This project is a Hippo Essentials Plugin Feature. Add this as a dependency to the Essentials module of a Hippo -project. After a (re)build it will show up as a Feature in the Feature Library. +This module contains a Hippo Essentials Plugin Feature. It adds a custom poll document: a document in the project +namespace with a title and the poll compound. It also adds a rendering template and some HST configuration for it. + +To use this feature, add a dependency to this artifact to the Essentials module of a Hippo project. After a (re)build it +will show up in the Feature Library. This Poll Demo feature will only work correctly if the Poll feature is installed BEFORE this feature. \ No newline at end of file View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/592743a2940b292f034e1bd25a36fe1127fea780 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/592743a2940b292f034e1bd25a36fe1127fea780 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][feature/HIPPLUG-1481] HIPPLUG-1481 remove the demo files, except the new README
Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / hippo-plugin-poll Commits: d915e268 by Jeroen Hoffman at 2017-10-20T10:19:07+02:00 HIPPLUG-1481 remove the demo files, except the new README - - - - - 30 changed files: - − demo/_demo_creation/README.txt - − demo/_demo_creation/components/CustomPollDocumentComponent.java - − demo/_demo_creation/components/CustomPollDocumentComponentInfo.java - − demo/_demo_creation/import/content-custom-example-poll.xml - − demo/_demo_creation/import/custompoll-catalogitem.xml - − demo/_demo_creation/import/custompoll-page.xml - − demo/_demo_creation/import/custompoll-sitemapitem.xml - − demo/_demo_creation/import/custompoll-template.xml - − demo/_demo_creation/import/custompoll-workspace-container.xml - − demo/_demo_creation/webfiles/custompoll.component.ftl - − demo/bootstrap/configuration/pom.xml - − demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/modules/autoexport-module.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-poll-document.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-poll-folder.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-resource-bundle.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/configuration/queries/templates/new-untranslated-folder.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/default/catalog.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/abstractpages.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/abstractpages/base.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/catalog.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/components.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages/custompoll.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages/homepage.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/pages/pagenotfound.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/prototypepages.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/sitemap.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/sitemenus.yaml - − demo/bootstrap/configuration/src/main/resources/hcm-config/hst/configurations/polldemo/templates.yaml The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/d915e2689c8f12588fd9836510da42d711b06960 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/d915e2689c8f12588fd9836510da42d711b06960 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][feature/HIPPLUG-1481] HIPPLUG-1481 temp rename back (back to lowercase 'custom')
Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / hippo-plugin-poll Commits: 17bf49f1 by Jeroen Hoffman at 2017-10-20T10:17:04+02:00 HIPPLUG-1481 temp rename back (back to lowercase custom) - - - - - 1 changed file: - essentials-demo-feature/src/main/resources/xml/namespace-myCustomPollDocument.xml → essentials-demo-feature/src/main/resources/xml/namespace-customPollDocument.xml Changes: = essentials-demo-feature/src/main/resources/xml/namespace-myCustomPollDocument.xml → essentials-demo-feature/src/main/resources/xml/namespace-customPollDocument.xml = View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/17bf49f1715493d2c1122cae5cbbaeeed696140d --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/17bf49f1715493d2c1122cae5cbbaeeed696140d You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] 2 commits: JCR-4201: Release Jackrabbit 2.15.7 - candidate release notes - change backed out
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit Commits: d1aa5497 by Julian Reschke at 2017-10-20T08:06:54+00:00 JCR-4201: Release Jackrabbit 2.15.7 - candidate release notes - change backed out git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1812721 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 6831185a by Julian Reschke at 2017-10-20T08:11:49+00:00 JCR-4201: Release Jackrabbit 2.15.7 - candidate release notes git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1812722 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 1 changed file: - jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/package-info.java Changes: = jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/package-info.java = --- a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/package-info.java +++ b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/package-info.java @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@aQute.bnd.annotation.Version("1.0.1") +@aQute.bnd.annotation.Version("1.0.0") package org.apache.jackrabbit.webdav.lock; View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/compare/c4a4e72adb680a2bab3c5eb9b5fb6a5c9f3beb9a...6831185a612c826a8e4d13269d87210262bc83a8 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/compare/c4a4e72adb680a2bab3c5eb9b5fb6a5c9f3beb9a...6831185a612c826a8e4d13269d87210262bc83a8 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][feature/HIPPLUG-1481] HIPPLUG-1481 temp rename (camelCase file issue)
Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / hippo-plugin-poll Commits: 736a0004 by Jeroen Hoffman at 2017-10-20T10:15:25+02:00 HIPPLUG-1481 temp rename (camelCase file issue) - - - - - 1 changed file: - essentials-demo-feature/src/main/resources/xml/namespace-CustomPollDocument.xml → essentials-demo-feature/src/main/resources/xml/namespace-myCustomPollDocument.xml Changes: = essentials-demo-feature/src/main/resources/xml/namespace-CustomPollDocument.xml → essentials-demo-feature/src/main/resources/xml/namespace-myCustomPollDocument.xml = View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/736a0004dda3a8e2f5659eeb548b2bbdb7d4a453 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/736a0004dda3a8e2f5659eeb548b2bbdb7d4a453 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] JCR-4201: Release Jackrabbit 2.15.7 - candidate release notes
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit Commits: c4a4e72a by Julian Reschke at 2017-10-20T07:47:05+00:00 JCR-4201: Release Jackrabbit 2.15.7 - candidate release notes git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1812717 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 2 changed files: - RELEASE-NOTES.txt - jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/package-info.java Changes: = RELEASE-NOTES.txt = --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,28 +1,42 @@ -Release Notes -- Apache Jackrabbit -- Version 2.15.6 +Release Notes -- Apache Jackrabbit -- Version 2.15.7 Introduction -This is Apache Jackrabbit(TM) 2.15.6, a fully compliant implementation of the +This is Apache Jackrabbit(TM) 2.15.7, a fully compliant implementation of the Content Repository for Java(TM) Technology API, version 2.0 (JCR 2.0) as specified in the Java Specification Request 283 (JSR 283). -Apache Jackrabbit 2.15.6 is an unstable release cut directly from +Apache Jackrabbit 2.15.7 is an unstable release cut directly from Jackrabbit trunk, with a focus on new features and other improvements. For production use we recommend the latest stable 2.14.x release. -Changes in Jackrabbit 2.15.6 +Changes in Jackrabbit 2.15.7 Bug -[JCR-4173] - Unable to receive observation events when connecting via DavEx -[JCR-4179] - Test failures with Java 9 when using javax.imageio.spi.ServiceRegistry +[JCR-3929] - ConsistencyCheck may fail on empty repository +[JCR-4183] - Jackrabbit standalone jar isn't working under JDK 8 +[JCR-4185] - spi2dav URIResolverImpl should check status code before attempting to parse multistatus +[JCR-4188] - avoid use of sun.security.acl.GroupImpl in PrincipalManagerTest + +Improvement + +[JCR-4182] - new release checksum requirements Task -[JCR-4177] - move Mockito version to parent pom +[JCR-4184] - migrate from org.mortbay.jetty to org.eclipse.jetty +[JCR-4186] - Use current Derby version + +Sub-task + +[JCR-4190] - maven-assembly-plugin:2.6:single failing with Java 9 +[JCR-4195] - jcr-rmi on java 9: Cannot use SUN rmic, as it is not available +[JCR-4196] - update surefire and failsafe plugins for use with java 9 +[JCR-4200] - javax.transaction.UserTransaction hidden by surefire plugin in with Java 9 In addition to the above-mentioned changes, this release contains = jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/package-info.java = --- a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/package-info.java +++ b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/package-info.java @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@aQute.bnd.annotation.Version("1.0.0") +@aQute.bnd.annotation.Version("1.0.1") package org.apache.jackrabbit.webdav.lock; View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/c4a4e72adb680a2bab3c5eb9b5fb6a5c9f3beb9a --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/c4a4e72adb680a2bab3c5eb9b5fb6a5c9f3beb9a 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