Oscar Scholten pushed to branch bugfix/HSTTWO-3942 at cms-community / hippo-site-toolkit
Commits: 251e8365 by Ard Schrijvers at 2017-04-11T17:06:16+02:00 HSTTWO-3958 Make sure resource bundle listener works correctly in multi site webapp The ResourceBundleWorkflowEventListener#getChannelName() did not comply to the javadoc: the channel name must be unique per jvm. However in case of a multi HST webapp, this requirement was violated. Hence, prefix the channel name with the context path - - - - - f69f9943 by Tobias Jeger at 2017-04-12T09:36:55+02:00 HSTTWO-3958 Fix the listener's "channelName" to be a valid node name - - - - - 8430e655 by Jeroen Hoffman at 2017-04-21T10:44:16+02:00 HSTTWO-3944 [forward port to master] to collect site map pages, use the configuration path of the argument mount, instead of the mount that is currently being edited (cherry picked from commit 0bf9af2fb89a1c76d0a643c037267832cc2faded) - - - - - 4f877d49 by Ate Douma at 2017-04-23T03:08:31+02:00 HSTTWO-3978 upgrade to latest log4j2 This is part of CMS-10707 - - - - - 059b6d16 by Ate Douma at 2017-04-23T03:14:59+02:00 HSTTWO-3978 upgrade to latest log4j2 Updating the log4j2.xml files after committed rename (to keep history) - - - - - 6df2b83a by Ate Douma at 2017-04-23T22:45:12+02:00 HSTTWO-3978 correct usage of file:// uri scheme for log4j configurationFile See CMS-10711 - - - - - fe6a27dd by Tobias Jeger at 2017-04-24T10:00:09+02:00 HSTTWO-3974 Reintroduce JCR event listener for resource bundle cache eviction - keep separate cache for live and preview "families" - (try to) invalidate both live and preview cache in case of RB-related JCR events (cherry picked from commit 8fd10b2ab77d97839b69a2d1528420f3e67c03b8) - - - - - a503e923 by Oscar Scholten at 2017-04-24T13:53:51+02:00 HSTTWO-3942 merge branch 'master' into bugfix/HSTTWO-3942 - - - - - 30 changed files: - api/src/main/java/org/hippoecm/hst/resourcebundle/internal/MutableResourceBundleFamily.java - − client-modules/cms-rest/src/test/resources/log4j.xml - + client-modules/cms-rest/src/test/resources/log4j2.xml - client-modules/page-composer/pom.xml - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java - client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ContainerItemComponentResourceTest.java - client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResourceTest.java - client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/MountResourceTest.java - − client-modules/page-composer/src/test/resources/log4j.dtd - − client-modules/page-composer/src/test/resources/log4j.xml - + client-modules/page-composer/src/test/resources/log4j2.xml - − client/src/test/resources/log4j.xml - + client/src/test/resources/log4j2.xml - components/core/pom.xml - components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-observation.xml - components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-resourcebundle.xml - components/core/src/test/java/org/hippoecm/hst/configuration/model/BrokenModelConfigurationsIT.java - components/core/src/test/java/org/hippoecm/hst/site/container/TestSpringComponentManagerWithAddonModules.java - − components/core/src/test/resources/log4j.xml - + components/core/src/test/resources/log4j2.xml - − components/jaxrs/src/test/resources/log4j.xml - + components/jaxrs/src/test/resources/log4j2.xml - components/resourcebundle/pom.xml - components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/DefaultMutableResourceBundleFamily.java - components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/DefaultMutableResourceBundleRegistry.java - + components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/HippoRepositoryResourceBundleEventListener.java - components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/HippoRepositoryResourceBundleFamilyFactory.java - − components/resourcebundle/src/main/java/org/hippoecm/hst/resourcebundle/internal/ResourceBundleWorkflowEventListener.java - components/resourcebundle/src/test/java/org/hippoecm/hst/resourcebundle/internal/DefaultMutableResourceBundleRegistryTest.java - − components/resourcebundle/src/test/resources/log4j.xml The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/compare/558b41081c3900f0278a65fa3edee7c28ea79240...a503e9234a3e328ee04102f3b9826aa414e0ebb9
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
