[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-1182
Tobias Jeger pushed new branch feature/ESSENTIALS-1182 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1182 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-essentials] Deleted branch feature/ESSENTIALS-1180
Tobias Jeger deleted branch feature/ESSENTIALS-1180 at cms-community / hippo-essentials --- 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-essentials][feature/ESSENTIALS-1180] ESSENTIALS-1180 Add explanatory comment
Tobias Jeger pushed to branch feature/ESSENTIALS-1180 at cms-community / hippo-essentials Commits: 4e7ed2e2 by Tobias Jeger at 2018-03-19T09:32:30+01:00 ESSENTIALS-1180 Add explanatory comment - - - - - 1 changed file: - plugins/template-query-generator/src/main/java/org/onehippo/cms7/essentials/templatequery/rest/TemplateQueryGeneratorResource.java Changes: = plugins/template-query-generator/src/main/java/org/onehippo/cms7/essentials/templatequery/rest/TemplateQueryGeneratorResource.java = --- a/plugins/template-query-generator/src/main/java/org/onehippo/cms7/essentials/templatequery/rest/TemplateQueryGeneratorResource.java +++ b/plugins/template-query-generator/src/main/java/org/onehippo/cms7/essentials/templatequery/rest/TemplateQueryGeneratorResource.java @@ -99,7 +99,7 @@ public class TemplateQueryGeneratorResource { @Path("/templatequeries") public List getTemplateQueries() throws Exception { return contentTypeService.fetchContentTypesFromOwnNamespace().stream() -.filter(this::isRelaxed) +.filter(this::isRelaxed) // has the effect that basedocument is excluded .filter(contentType -> !contentType.isCompoundType()) .map(this::createTemplateQuery) .collect(Collectors.toList()); View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/4e7ed2e231330d7088560d2bea84944115de7fb1 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/4e7ed2e231330d7088560d2bea84944115de7fb1 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][master] HIPPLUG-1520 Update Demo Essentials Plugin for CMS 12.2
Tobias Jeger pushed to branch master at cms-community / hippo-plugin-poll Commits: d437c925 by Tobias Jeger at 2018-02-20T16:42:43+01:00 HIPPLUG-1520 Update Demo Essentials Plugin for CMS 12.2 - - - - - 2 changed files: - essentials-demo-feature/README.txt - essentials-demo-feature/src/main/resources/plugin-descriptor.json Changes: = essentials-demo-feature/README.txt = --- a/essentials-demo-feature/README.txt +++ b/essentials-demo-feature/README.txt @@ -6,4 +6,8 @@ namespace with a title and the poll compound. It also adds a rendering template 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 + + org.onehippo.cms7 + hippo-plugin-poll-essentials-demo-feature + ${hippo.plugin.poll.version} + = essentials-demo-feature/src/main/resources/plugin-descriptor.json = --- a/essentials-demo-feature/src/main/resources/plugin-descriptor.json +++ b/essentials-demo-feature/src/main/resources/plugin-descriptor.json @@ -1,17 +1,15 @@ { - "@type": "plugin", "id": "hippo-plugin-poll-essentials-demoId", + "type": "feature", "name": "Polls Demo", "icon": "", "introduction": "This plugin shows how you can extend the Poll plugin and use it in a custom document. NOTE: the Poll feature must be installed BEFORE this one for this feature to work.", - "packageFile": "/META-INF/instructions.xml", - "restClasses": [], - "type": "feature", "vendor" : { -"@type": "vendor", "name" : "BloomReach", "url" : "https://www.bloomreach.com; }, + "packageFile": "/META-INF/instructions.xml", + "installWithParameters": false, "categories": { "application": [ "content" @@ -23,9 +21,12 @@ "community" ] }, - "libraries": [ + "pluginDependencies": [ +{ + "pluginId": "skeleton" +}, { - "items": [] + "pluginId": "pollPlugin" } ] } \ No newline at end of file View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/d437c92519f1d9882f52ccaf327cf40f3d6c153a --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/d437c92519f1d9882f52ccaf327cf40f3d6c153a 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-essentials][master] ESSENTIALS-604 Move too immature folder picker out of SDK API.
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 610eb0f8 by Tobias Jeger at 2018-02-08T12:40:35+01:00 ESSENTIALS-604 Move too immature folder picker out of SDK API. - - - - - 3 changed files: - plugin-sdk/api/src/main/resources/META-INF/resources/dashboard/api/templates/essentials-folder-picker.html → dashboard/src/main/webapp/directives/essentials-folder-picker.html - dashboard/src/main/webapp/js/directives.js - plugin-sdk/api/src/main/resources/META-INF/resources/dashboard/api/directives.js Changes: = plugin-sdk/api/src/main/resources/META-INF/resources/dashboard/api/templates/essentials-folder-picker.html → dashboard/src/main/webapp/directives/essentials-folder-picker.html = = dashboard/src/main/webapp/js/directives.js = --- a/dashboard/src/main/webapp/js/directives.js +++ b/dashboard/src/main/webapp/js/directives.js @@ -224,5 +224,73 @@ $scope.hasMessages = !!$scope.plugin.packageFile; } }; +}).directive("essentialsFolderPicker", function () { +return { +replace: false, +restrict: 'E', +scope: { +title: '@', +buttonText: '@', +selectedPath: '=', +selected: '=' +}, +templateUrl: 'directives/essentials-folder-picker.html', +controller: function ($scope, $uibModal, $log, $http) { +$scope.open = function (size) { +var modalInstance = $uibModal.open({ +templateUrl: 'tree-picker.html', +controller: ModalInstanceCtrl, +size: size, +resolve: { +title: function () { +return $scope.title; +}, buttonText: function () { +return $scope.buttonText; +}, selectedPath: function () { +return $scope.selectedPath; +}, selected: function () { +return $scope.selected; +} +} + +}); +modalInstance.result.then(function (selected) { +if (selected) { +$scope.selected = selected; +$scope.selectedPath = selected.id; +} +}); +}; + +var ModalInstanceCtrl = function ($scope, $uibModalInstance, title) { +$scope.title = title; +$http.get(window.SERVER_URL + '/essentials/rest/jcrbrowser/folders').success(function (data) { +$scope.treeItems = data.items; +}); +$scope.ok = function () { +$uibModalInstance.close($scope.selected); +}; +$scope.cancel = function () { +$uibModalInstance.dismiss('cancel'); +}; +$scope.callbacks = { +accept: function () { +// disable drag/drop stuff +return false; +}, +dragStart: function (event) { +$scope.selected = event.source.nodeScope.$modelValue; +$scope.selectedPath = $scope.selected.id; +}, +dragStop: function (event) { +// noop +}, +dropped: function (event) { +// noop +} +}; +}; +} +}; }); })(); = plugin-sdk/api/src/main/resources/META-INF/resources/dashboard/api/directives.js = --- a/plugin-sdk/api/src/main/resources/META-INF/resources/dashboard/api/directives.js +++ b/plugin-sdk/api/src/main/resources/META-INF/resources/dashboard/api/directives.js @@ -59,74 +59,6 @@ } } }; -}).directive("essentialsFolderPicker", function () { - return { -replace: false, -restrict: 'E', -scope: { - title: '@', - buttonText: '@', -
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch bugfix/ESSENTIALS-1143
Tobias Jeger deleted branch bugfix/ESSENTIALS-1143 at cms-community / hippo-essentials --- 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-essentials][master] 3 commits: ESSENTIALS-1143 Put blog detail templates into "shared" hstdefault folder
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 8453a21c by Tobias Jeger at 2018-02-04T21:15:14+01:00 ESSENTIALS-1143 Put blog detail templates into shared hstdefault folder - - - - - 796a8c8f by Tobias Jeger at 2018-02-07T21:54:40+01:00 ESSENTIALS-1143 Merge branch master into bugfix/ESSENTIALS-1143 - - - - - 60f24d08 by Tobias Jeger at 2018-02-07T22:17:36+01:00 ESSENTIALS-1143 Reintegrate bugfix/ESSENTIALS-1143 - - - - - 3 changed files: - plugins/blog/src/main/resources/META-INF/blog_instructions.xml - plugins/blog/src/main/resources/hst/template-blog-detail-freemarker.xml - plugins/blog/src/main/resources/hst/template-blog-detail-jsp.xml Changes: = plugins/blog/src/main/resources/META-INF/blog_instructions.xml = --- a/plugins/blog/src/main/resources/META-INF/blog_instructions.xml +++ b/plugins/blog/src/main/resources/META-INF/blog_instructions.xml @@ -86,7 +86,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -113,13 +113,13 @@ target="{{freemarkerRoot}}/hstdefault/blog/blog-list_nl.properties"/> + target="{{freemarkerRoot}}/hstdefault/blog/blog-detail/variant.ftl"/> + target="{{freemarkerRoot}}/hstdefault/blog/blog-detail.properties"/> + target="{{freemarkerRoot}}/hstdefault/blog/blog-detail_nl.properties"/>
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch feature/ESSENTIALS-1151
Tobias Jeger deleted branch feature/ESSENTIALS-1151 at cms-community / hippo-essentials --- 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-essentials][master] 22 commits: ESSENTIALS-1151 Move InstallState into SDK API
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 890d5d4b by Tobias Jeger at 2018-02-02T11:55:31+01:00 ESSENTIALS-1151 Move InstallState into SDK API in order to be able to put dependencies on it into PluginDescriptor - - - - - eb516650 by Tobias Jeger at 2018-02-02T11:55:31+01:00 ESSENTIALS-1151 Implement and unit-test new installation state machine The new state machine knows two more states: boarding pending and installation pending. These indicate that a plugin is waiting to board or install, and cannot do so because a dependent plugin hasnt reached the proper installation state yet. These dependencies have been added to the PluginDescriptor: a plugin can depend on multiple other plugins, and for each dependent plugin, one can specify in what minimal state it should be before the requested plugin can board or be installed. The front-end and the plugin descriptors have not yet been changed. - - - - - e2925c62 by Tobias Jeger at 2018-02-02T11:55:31+01:00 ESSENTIALS-1151 Move InstallStateMachine into install package Also, embedded PluginFileResourceService into InstallService, and made PluginFileService an injectable @Service. And noticed that the previous commit did not load a plugins state into PluginDescriptor, this is fixed now. - - - - - 958e1a46 by Tobias Jeger at 2018-02-02T11:55:31+01:00 ESSENTIALS-1151 Refactor front-end to deal with inter-plugin dependencies - Make skeleton package a real plugin (with a descriptor). - Extract CRISP and P13N packages from the commerce plugins (shared installation logic), and added dependencies. - Express inter-plugin dependencies explicitly - Create front-end pluginService as the central place for dealing with plugins. Clean up the old usages and supportive variables. - Add human-readable list of dependencies to dashboard library. - Indicate new pending state in dashboard (where applicable). - - - - - b1e6f431 by Tobias Jeger at 2018-02-02T11:55:32+01:00 ESSENTIALS-1151 Create MavenModelService for enterpriseProject plugin After moving the EnterpriseUtils logic into the enterpriseProject plugin, the plugin depended on the SDK implementation. The introduction of the MavenModelService remove that undesirable dependency. - - - - - 1e8c05ee by Tobias Jeger at 2018-02-02T11:55:32+01:00 ESSENTIALS-1151 Kill the showInDashboard mechanism On second thought, it seems unnecessary to hide some dependencies in the dashboard, it would lead to more magic operation and confusion, and to lower-quality plugin descriptors. Ive improved the crisp and personalization plugin descriptors and ripped out the showInDashboard mechanism. - - - - - 95816d90 by Tobias Jeger at 2018-02-02T11:55:32+01:00 ESSENTIALS-1151 Default plugin dependencies to installing-when-installing To save a lot of repetition in plugin descriptors, by default, a plugin dependency has the minInstallStateForInstalling set to installing, meaning that inorder to start the installation phase of the plugin (as opposed to the boarding phase), the depended-on plugin must be in at least the state installing itself, too. - - - - - 70eb7507 by Tobias Jeger at 2018-02-02T11:55:32+01:00 ESSENTIALS-1151 Improve new plugins and dependencies Manual testing revealed - two icons not setup correctly - the enterprise project plugin erroneously depending on the skeleton - - - - - 81e4311e by Tobias Jeger at 2018-02-02T11:55:32+01:00 ESSENTIALS-1151 Avoid concurrent installation of multiple plugins ...to avoid race conditions. - - - - - c655b428 by Tobias Jeger at 2018-02-02T11:55:32+01:00 ESSENTIALS-1151 Create angular projectService This gets rid of many of the remaining dirty $rootScope usages. projectService caches the project settings, so the new solution is also performing better. I improved the pluginService by moving the sorting and icon-selection into the getChangeMessages method, and I fixed the simple install plugin to get back a working uib-accordion for showing the parameter- dependent change messages. - - - - - f5830425 by Tobias Jeger at 2018-02-02T11:55:32+01:00 ESSENTIALS-1151 Remove unused test resources - - - - - c83a3d71 by Tobias Jeger at 2018-02-03T12:54:52+01:00 ESSENTIALS-1151 Complete CRISP installation - - - - - 9d52cad6 by Tobias Jeger at 2018-02-03T15:09:39+01:00 ESSENTIALS-1151 Provide link back to global settings - - - - - 6481d1c6 by Tobias Jeger at 2018-02-04T11:27:42+01:00 ESSENTIALS-1151 Improve spring injection Use injecting constructors where possible. Avoid unnecessary passing of bean arguments. Also fix an issue with the installation detection of CRISP in the BR P13N connector tool, now that the CRISP feature provides full installation. In fact, I suspect that tool should be integrated with the CRISP feature plugin. - - - - - cf3bec41 by Tobias Jeger at 2018-02-04T11:42:40+01:00 ESSENTIALS-1151 Avoid flickering UX when installing features - - - - - b217222b by Tobias Jeger at 2018-02-04T17:04:09+01:00 ESSENTIALS-1151 Move directives
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1151] 13 commits: ESSENTIALS-1136 update all changed manageContent attributes
Tobias Jeger pushed to branch feature/ESSENTIALS-1151 at cms-community / hippo-essentials Commits: 46f34bb6 by Bert Leunis at 2018-02-02T14:15:59+01:00 ESSENTIALS-1136 update all changed manageContent attributes - - - - - 03d0536d by Arent-Jan Banck at 2018-02-02T21:00:46+01:00 ESSENTIALS-1137 Remove empty ProjectServiceImpleTest - - - - - ccb390fa by Arent-Jan Banck at 2018-02-02T21:49:31+01:00 ESSENTIALS-1137 Clean system properties after test to avoid test failers in other tests - - - - - 900af2fd by Arent-Jan Banck at 2018-02-02T22:05:42+01:00 ESSENTIALS-1137 Call createModifiableDirectory before placeholderService is used as createModifiableDirectory sets a system property with the directory path used by the placeholderService. Test will fail dependening on the test execution order, failed on Windows - - - - - fbdd16f5 by Arent-Jan Banck at 2018-02-02T22:21:26+01:00 ESSENTIALS-1137 Remove unused import and redundant cast - - - - - f21b7079 by Arent-Jan Banck at 2018-02-02T22:35:37+01:00 ESSENTIALS-1164 Use the same dom4j version for the plugins as in the plugin SDK. Moved the dom4j.version to the root of the project and bumped to 2.1.0. Use resource-protection for the SAXReader opening an xml file to make sure file handles are released, re-enabled the relevant tests for Windows - - - - - 32420712 by Tobias Jeger at 2018-02-04T21:01:50+01:00 ESSENTIALS-1154 Fix hippostd:state of blogpost prototype Should be draft, not unpublished. - - - - - fd2f073b by Michael Metternich at 2018-02-05T09:26:34+01:00 ESSENTIALS-1136 Revert update all changed manageContent attributes This reverts commit 46f34bb - - - - - 4ebb0fd7 by Michael Metternich at 2018-02-05T09:29:40+01:00 ESSENTIALS-1163 update all changed manageContent attributes - - - - - 855624a6 by Michael Metternich at 2018-02-05T09:37:47+01:00 ESSENTIALS-1163 Merge master into feature/ESSENTIALS-1163 - - - - - a7c40e82 by Michael Metternich at 2018-02-05T09:41:37+01:00 ESSENTIALS-1163 Reintegrate feature/ESSENTIALS-1163 - - - - - 3db22e38 by Tobias Jeger at 2018-02-07T21:10:17+01:00 ESSENTIALS-1151 Merge branch master into feature/ESSENTIALS-1151 - - - - - 9cf9e3bb by Tobias Jeger at 2018-02-07T21:11:27+01:00 ESSENTIALS-1151 Remove empty file - - - - - 30 changed files: - − dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/Plugin.java - plugin-sdk/implementation/pom.xml - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/utils/Dom4JUtils.java - − plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ProjectServiceImplTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/WebXmlServiceImplTest.java - plugins/banner-and-carousel/src/main/resources/freemarker/essentials-banner-without-description.ftl - plugins/banner-and-carousel/src/main/resources/freemarker/essentials-banner.ftl - plugins/banner-and-carousel/src/main/resources/freemarker/essentials-carousel.ftl - plugins/banner-and-carousel/src/main/resources/jsp/essentials-banner.jsp - plugins/banner-and-carousel/src/main/resources/jsp/essentials-carousel.jsp - plugins/blog/src/main/resources/freemarker/blog-detail-variant.ftl - plugins/blog/src/main/resources/freemarker/blog-detail.ftl - plugins/blog/src/main/resources/freemarker/blog-list-variant.ftl - plugins/blog/src/main/resources/freemarker/blog-list.ftl - plugins/blog/src/main/resources/jsp/blog-detail.jsp - plugins/blog/src/main/resources/jsp/blog-list.jsp - plugins/blog/src/main/resources/xml/namespaces/blogpost.xml - plugins/events/src/main/resources/freemarker/eventslist-main-eventslist-variant.ftl - plugins/events/src/main/resources/freemarker/eventslist-main-eventslist.ftl - plugins/events/src/main/resources/freemarker/eventspage-main-variant.ftl - plugins/events/src/main/resources/freemarker/eventspage-main.ftl - plugins/events/src/main/resources/jsp/eventslist-main-eventslist.jsp - plugins/events/src/main/resources/jsp/eventspage-main.jsp - plugins/faq/src/main/resources/instructions/freemarker/faq-main.ftl - plugins/faq/src/main/resources/instructions/freemarker/faqlist-main-variant.ftl - plugins/faq/src/main/resources/instructions/freemarker/faqlist-main.ftl - plugins/faq/src/main/resources/instructions/jsp/faq-main.jsp - plugins/faq/src/main/resources/instructions/jsp/faqlist-main.jsp - plugins/list/src/main/resources/freemarker/list-component-pagination-on-top-and-bottom.ftl The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/563d0f649d65df01e74c3bdcdf2032787e617c05...9cf9e3bbd0fee3cddb58f0e60cacecdb80b3c02c --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/563d0f649d65df01e74c3bdcdf2032787e617c05...9cf9e3bbd0fee3cddb58f0e60cacecdb80b3c02c
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1151] ESSENTIALS-1151 Remove superfluous code
Tobias Jeger pushed to branch feature/ESSENTIALS-1151 at cms-community / hippo-essentials Commits: 563d0f64 by Tobias Jeger at 2018-02-07T21:09:36+01:00 ESSENTIALS-1151 Remove superfluous code - - - - - 1 changed file: - dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java Changes: = dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java = --- a/dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java +++ b/dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java @@ -192,10 +192,6 @@ public class PluginStore { // load the plugin's current installation state installService.loadInstallStateFromFileSystem(plugin); -if (PluginDescriptor.TYPE_TOOL.equals(plugin.getType())) { -// tools are pre-installed and should not default to depend on the skeleton package. -plugin.setPluginDependencies(null); -} plugin.setDependencySummary(makeDependencySummary(plugin, pluginSet)); // extract all REST classes to setup the dynamic endpoints View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/563d0f649d65df01e74c3bdcdf2032787e617c05 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/563d0f649d65df01e74c3bdcdf2032787e617c05 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-essentials] Pushed new branch bugfix/ESSENTIALS-1143
Tobias Jeger pushed new branch bugfix/ESSENTIALS-1143 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/bugfix/ESSENTIALS-1143 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-essentials][master] ESSENTIALS-1154 Fix hippostd:state of blogpost prototype
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 32420712 by Tobias Jeger at 2018-02-04T21:01:50+01:00 ESSENTIALS-1154 Fix hippostd:state of blogpost prototype Should be draft, not unpublished. - - - - - 1 changed file: - plugins/blog/src/main/resources/xml/namespaces/blogpost.xml Changes: = plugins/blog/src/main/resources/xml/namespaces/blogpost.xml = --- a/plugins/blog/src/main/resources/xml/namespaces/blogpost.xml +++ b/plugins/blog/src/main/resources/xml/namespaces/blogpost.xml @@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch feature/ESSENTIALS-1164
Tobias Jeger deleted branch feature/ESSENTIALS-1164 at cms-community / hippo-essentials --- 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-essentials][feature/ESSENTIALS-1151] 3 commits: ESSENTIALS-1151 Complete CRISP installation
Tobias Jeger pushed to branch feature/ESSENTIALS-1151 at cms-community / hippo-essentials Commits: c83a3d71 by Tobias Jeger at 2018-02-03T12:54:52+01:00 ESSENTIALS-1151 Complete CRISP installation - - - - - 9d52cad6 by Tobias Jeger at 2018-02-03T15:09:39+01:00 ESSENTIALS-1151 Provide link back to global settings - - - - - 6481d1c6 by Tobias Jeger at 2018-02-04T11:27:42+01:00 ESSENTIALS-1151 Improve spring injection Use injecting constructors where possible. Avoid unnecessary passing of bean arguments. Also fix an issue with the installation detection of CRISP in the BR P13N connector tool, now that the CRISP feature provides full installation. In fact, I suspect that tool should be integrated with the CRISP feature plugin. - - - - - 30 changed files: - dashboard/src/main/java/org/onehippo/cms7/essentials/dashboard/install/InstallService.java - dashboard/src/main/java/org/onehippo/cms7/essentials/dashboard/install/InstallStateMachine.java - dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java - dashboard/src/main/java/org/onehippo/cms7/essentials/rest/DocumentResource.java - dashboard/src/main/java/org/onehippo/cms7/essentials/rest/PluginResource.java - dashboard/src/main/java/org/onehippo/cms7/essentials/rest/ProjectResource.java - dashboard/src/main/java/org/onehippo/cms7/essentials/rest/picker/JcrBrowserResource.java - dashboard/src/main/java/org/onehippo/cms7/essentials/servlet/DynamicRestPointsApplication.java - dashboard/src/main/webapp/WEB-INF/jsp/index.jsp - dashboard/src/test/java/org/onehippo/cms7/essentials/dashboard/install/InstallStateMachineTest.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/config/PluginFileService.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/packaging/DefaultInstructionPackage.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/ContentBeansServiceImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/ContentTypeServiceImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/ContextXmlServiceImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/MavenAssemblyServiceImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/MavenCargoServiceImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/MavenDependencyServiceImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/MavenModelServiceImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/MavenRepositoryServiceImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/PlaceholderServiceImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/SettingsServiceImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/WebXmlServiceImpl.java - − plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/utils/EnterpriseUtils.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/utils/GlobalUtils.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/utils/ProjectUtils.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/instruction/HstBeanClassesInstructionTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/packaging/DefaultInstructionPackageTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ContentBeansServiceTest.java The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/f58304255e1961836a34c155841cef59df079c2e...6481d1c698fa98383b560d8f677c69b3307ce487 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/f58304255e1961836a34c155841cef59df079c2e...6481d1c698fa98383b560d8f677c69b3307ce487 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-essentials][feature/ESSENTIALS-1137] 32 commits: ESSENTIALS-1110 Make essentials part of create content setup
Tobias Jeger pushed to branch feature/ESSENTIALS-1137 at cms-community / hippo-essentials Commits: 5feb954d by Michael Metternich at 2017-11-13T13:39:51+01:00 ESSENTIALS-1110 Make essentials part of create content setup - - - - - b01f9ed5 by Michael Metternich at 2017-11-13T13:53:55+01:00 ESSENTIALS-1110 Remove create-content tag - - - - - 0a3e9917 by Michael Metternich at 2017-11-13T13:56:57+01:00 ESSENTIALS-1110 Set create-content tag - - - - - ba2ceee4 by Michael Metternich at 2017-12-01T11:13:25+01:00 ESSENTIALS-1129 Merge master into feature/create-content - - - - - 462b5aa1 by Michael Metternich at 2017-12-01T11:23:30+01:00 ESSENTIALS-1129 Add create-content version to new plugins - - - - - a11e1bb3 by Michael Metternich at 2017-12-22T15:02:58+01:00 ESSENTIALS-1108 Change cmseditlink to manage content tag - - - - - ed98496f by Bert Leunis at 2018-01-05T15:09:06+01:00 ESSENTIALS-1108 faq list template with separate buttons for create and edit - - - - - 83150332 by Michael Metternich at 2018-01-09T09:39:58+01:00 ESSENTIALS-1108 Change cmseditlink to manage content tag for news plugin - - - - - f7bb51e1 by Michael Metternich at 2018-01-09T10:37:37+01:00 ESSENTIALS-1108 Change manage content tag for content plugin - - - - - 9585e352 by Michael Metternich at 2018-01-09T16:02:25+01:00 ESSENTIALS-1108 News manage content tag should not create content - - - - - cc9a29c2 by Michael Metternich at 2018-01-09T16:30:16+01:00 ESSENTIALS-1108 Change manage content tag for events plugin - - - - - 63d3c86b by Michael Metternich at 2018-01-11T16:15:27+01:00 ESSENTIALS-1108 Change manage content tag for search plugin - - - - - abc096e4 by Michael Metternich at 2018-01-11T16:21:11+01:00 ESSENTIALS-1108 Change manage content tag for list plugin - - - - - ff029c7d by Michael Metternich at 2018-01-12T11:11:17+01:00 ESSENTIALS-1108 Tags in blog should not add new documents Date field type is not supported in right side panel, so new documents cannot be created from the right side panel. - - - - - 69bc6995 by Michael Metternich at 2018-01-12T11:11:57+01:00 ESSENTIALS-1108 Consistently use rootPath instead of defaultPath - - - - - c4af5b73 by Michael Metternich at 2018-01-12T11:12:23+01:00 ESSENTIALS-1108 Also update jsp files - - - - - 2af0ed80 by Bert Leunis at 2018-01-15T14:27:55+01:00 ESSENTIALS-1108 layout fixes. add defaultPath for new faq items. - - - - - d144bc36 by Bert Leunis at 2018-01-15T15:49:01+01:00 ESSENTIALS-1129 Merge master changes in feature/create-content - - - - - 96333dfa by Bert Leunis at 2018-01-15T15:56:47+01:00 ESSENTIALS-1108 Merge feature/create-content changes in feature/CC-ESSENTIALS-1108 - - - - - 75ddefce by Bert Leunis at 2018-01-18T12:55:40+01:00 ESSENTIALS-1108 use new request attributes for year/month strings - - - - - 1ec61956 by Bert Leunis at 2018-01-18T13:01:12+01:00 ESSENTIALS-1108 Reintegrate feature/CC-ESSENTIALS-1108 - - - - - bf63e192 by Bert Leunis at 2018-01-19T15:27:05+01:00 ESSENTIALS-1110 add manageContent buttons for carousel documents - - - - - 78b8fa07 by Bert Leunis at 2018-01-29T13:55:45+01:00 ESSENTIALS-1155 if a banner component has a banner document configured, you can now use the orange button to pick another one - - - - - b58549b7 by Bert Leunis at 2018-01-29T15:50:30+01:00 ESSENTIALS-1158 add the option to create a new document from the generic content list templates - - - - - ea2908db by Bert Leunis at 2018-01-29T17:00:10+01:00 ESSENTIALS-1156 to option to add new faq item documents has been removed - - - - - d717ea44 by Michael Metternich at 2018-01-30T10:14:40+01:00 ESSENTIALS-1156 Merge feature/create-content - - - - - 681e1c5f by Michael Metternich at 2018-01-30T10:16:30+01:00 ESSENTIALS-1156 Also removed rootPath - - - - - 135909ae by Michael Metternich at 2018-01-30T10:17:21+01:00 ESSENTIALS-1156 Reintegrate bugfix/CC-ESSENTIALS-1156 - - - - - 964a0ac8 by Michael Metternich at 2018-01-30T10:37:33+01:00 ESSENTIALS-1158 Merge feature/create-content - - - - - 2a4e93a8 by Bert Leunis at 2018-02-01T16:00:02+01:00 ESSENTIALS-1129 Merge master changes in feature/create-content - - - - - 3c7d181c by Bert Leunis at 2018-02-01T16:05:05+01:00 ESSENTIALS-1129 Reintegrate feature/create-content - - - - - d437b848 by Tobias Jeger at 2018-02-02T11:15:02+01:00 ESSENTIALS-1137 Merge branch master into feature/ESSENTIALS-1137 - - - - - 30 changed files: - plugins/banner-and-carousel/src/main/resources/freemarker/essentials-banner-without-description.ftl - plugins/banner-and-carousel/src/main/resources/freemarker/essentials-banner.ftl - plugins/banner-and-carousel/src/main/resources/freemarker/essentials-carousel.ftl - plugins/banner-and-carousel/src/main/resources/jsp/essentials-banner.jsp - plugins/banner-and-carousel/src/main/resources/jsp/essentials-carousel.jsp - plugins/blog/src/main/resources/freemarker/blog-detail-variant.ftl - plugins/blog/src/main/resources/freemarker/blog-detail.ftl - plugins/blog/src/main/resources
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch feature/ESSENTIALS-1137
Tobias Jeger deleted branch feature/ESSENTIALS-1137 at cms-community / hippo-essentials --- 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-essentials] Pushed new branch feature/ESSENTIALS-1151
Tobias Jeger pushed new branch feature/ESSENTIALS-1151 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1151 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-essentials][master] 48 commits: ESSENTIALS-1137 Simplify aggregation of RebuildEvents
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 49385f10 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Simplify aggregation of RebuildEvents Essentials plugins can indicate that they require a project rebuild and restart. They used to do so by constructing an event class, and posting it on the eventBus. A listener would collect them into a list, from which the dashboard collects them during each Ping. The same functionality has been simplified inside the RebuildService, which avoid the need for the event bus, collects the relevant information (plugin IDs only) and provides them to the dashboard. With this change, the last use of the APIs PluginEvent is gone, and so the PluginEvent interface is removed from the API. - - - - - 7e9607b3 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove unused classes - - - - - 91e2b1f0 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove superfluous ProjectResource#coordinates endpoint - - - - - a19da663 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Make the selections tool depend on the SDK API only - - - - - 1e258b4c by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Refactor PluginContext and ProjectUtils PluginContext used to be a misnamed collection of project specific settings and logic, extensively using ProjectUtils and, upon construction reading the ProjectSettings from a project resource, over and over again. This extensive refactoring moves most of the combined logic from PluginContext and ProjectUtils into a new, Spring-injectable ProjectService, who, in turn, uses a new SettingsService for managing the project settings/parameters. This refactoring cleans up quite some duplicate (and sometimes buggy) logic and reduces the weight of and need to instantiate and pass along PluginContexts all through Essentials. - - - - - da6bfe03 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 More refactoring of PluginContext With the PluginContext having lost much of its weight and importance, it was now unused in many method signature and interface. This commit focuses on removing this superfluous passing-around of PluginContext instances. This commit also cleans up the ProjectSettings API to only contain getters, and only for fields potentially relevant to plugins. Dashboard- internal data can be accessed through the ProjectSettingsBean, as can the settings be adjusted. - - - - - c60b793e by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove unnecessary complexity in PluginConfigService PluginConfigService used to be an SDK API interface for (de-)serializing Documents to/from XML files. This mechanism is intended for the Dashboard only, and used in the plugin InstallStateMachine and the SettingsServiceImpl (for managing the project-global settings). This refactoring removes these concepts from the SDK API (not relevant there) and removes unnecessary abstraction layers. - - - - - 53838ddb by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Improve Javadoc of SDK API services - - - - - c4fd0d5c by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove unused JAX-RS parameters - - - - - ab2a0d02 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove lots of unused and some duplicate code - Moved the PluginModuleRestful from the SDK to the dashboard, because its only used in the dashboard and not intended to be exposed to plugins. - - - - - da76b33c by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove usage of instructions from REST and Gallery tools Instead of manually executing an instruction set, I refactored the FileInstruction to use the ProjectService for copying files to the project or deleting files from the project. The REST resource if the REST plugin can now use the ProjectService (and JcrService) directly, rather than taking the elaborate detour through the instruction mechanism, which should really be dashboard-internal. - - - - - fd12bf29 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove installation instruction-related APIs All but the Instruction API are really only used internally by the Dashboard, so they should not be part of the API. Plugins who used to use these InstructionXYZ APIs have been refactored to use the services directly, which is considerably simpler to comprehend/ maintain. - - - - - 39a431f7 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Move MessageGroup and InstructionStatus into Instruction These two enumerations were only used in the context of an Instruction. Also, their naming has been improved to Type and Status. - - - - - 50e2dad2 by Tobias Jeger at 2018-01-16T23:26:39+01:00 ESSENTIALS-1137 Move EssentialsGenerated annotation to SDK impl module - - - - - 22bb2c5e by Tobias Jeger at 2018-01-16T23:26:39+01:00 ESSENTIALS-1137 Improve plugin SDK package naming changed o.o.c.essentials.dashboard
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1137] 4 commits: ESSENTIALS-604 Update copyright year of NOTICE file to 2018
Tobias Jeger pushed to branch feature/ESSENTIALS-1137 at cms-community / hippo-essentials Commits: f66867e0 by Arent-Jan Banck at 2018-01-23T21:20:58+01:00 ESSENTIALS-604 Update copyright year of NOTICE file to 2018 - - - - - 615645e1 by Arent-Jan Banck at 2018-01-24T12:02:53+01:00 ESSENTIALS-1153 Update copyright year to 2018 - - - - - 12a1a99c by Tobias Jeger at 2018-01-29T12:53:09+01:00 ESSENTIALS-1157 Fix failing unit tests on Windows - - - - - 1823b6d2 by Tobias Jeger at 2018-01-30T12:06:36+01:00 ESSENTIALS-1137 Merge branch master into feature/ESSENTIALS-1137 - - - - - 6 changed files: - NOTICE - dashboard/src/main/webapp/pages/introduction.html - + plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ProjectServiceImplTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ContentTypeServiceImplTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/WebXmlServiceImplTest.java Changes: = NOTICE = --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Hippo Essentials -Copyright 2013-2017 Hippo B.V., Amsterdam, The Netherlands (http://www.onehippo.com/) +Copyright 2013-2018 Hippo B.V., Amsterdam, The Netherlands (http://www.onehippo.com/) This product includes software developed by: Hippo B.V., Amsterdam, The Netherlands (http://www.onehippo.com/); = dashboard/src/main/webapp/pages/introduction.html = --- a/dashboard/src/main/webapp/pages/introduction.html +++ b/dashboard/src/main/webapp/pages/introduction.html @@ -1,5 +1,5 @@
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1137] ESSENTIALS-1137 Improve file handling on Windows
Tobias Jeger pushed to branch feature/ESSENTIALS-1137 at cms-community / hippo-essentials Commits: cf155f43 by Tobias Jeger at 2018-01-30T09:44:56+01:00 ESSENTIALS-1137 Improve file handling on Windows - - - - - 3 changed files: - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/instruction/FileInstruction.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/utils/CndUtilsTest.java Changes: = plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/instruction/FileInstruction.java = --- a/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/instruction/FileInstruction.java +++ b/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/instruction/FileInstruction.java @@ -16,6 +16,7 @@ package org.onehippo.cms7.essentials.plugin.sdk.instruction; +import java.io.File; import java.util.Map; import java.util.function.BiConsumer; @@ -62,6 +63,7 @@ public class FileInstruction extends BuiltinInstruction { log.error("Invalid file instruction '{}'.", toString()); return Status.FAILED; } +preprocessTarget(); return projectService.copyResource("/" + source, target, placeholderData, overwrite, binary) ? Status.SUCCESS : Status.FAILED; case DELETE: @@ -85,6 +87,11 @@ public class FileInstruction extends BuiltinInstruction { } } +private void preprocessTarget() { +// the instruction file uses '/' as file separator, but the OS may use a different character... +target = target.replace('/', File.separatorChar); +} + @XmlAttribute public boolean isBinary() { return binary; = plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java = --- a/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java +++ b/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java @@ -210,7 +210,7 @@ public class ProjectServiceImplTest extends ResourceModifyingTest { @Test public void copy_absent_resource() throws Exception { final String resourcePath = "/services/project/absent.txt"; -final String targetLocation = "{{" + PlaceholderService.PROJECT_ROOT + "}}/test/copy.txt"; +final String targetLocation = "{{" + PlaceholderService.PROJECT_ROOT + "}}" + File.separator + "test" + File.separator + "copy.txt"; final Map<String, Object> placeholderData = placeholderService.makePlaceholders(); try (Log4jInterceptor interceptor = Log4jInterceptor.onError().trap(ProjectServiceImpl.class).build()) { @@ -222,7 +222,7 @@ public class ProjectServiceImplTest extends ResourceModifyingTest { @Test public void copy_onto_directory() throws Exception { final String resourcePath = "/services/project/to-be-copied.txt"; -final String targetLocation = "{{" + PlaceholderService.PROJECT_ROOT + "}}/test"; +final String targetLocation = "{{" + PlaceholderService.PROJECT_ROOT + "}}" + File.separator + "test"; final Map<String, Object> placeholderData = placeholderService.makePlaceholders(); createModifiableDirectory("test"); @@ -235,7 +235,7 @@ public class ProjectServiceImplTest extends ResourceModifyingTest { @Test public void delete_non_empty_dir() throws Exception { final String resourcePath = "/services/project/to-be-copied.txt"; -final String targetLocation = "{{" + PlaceholderService.PROJECT_ROOT + "}}/test"; +final String targetLocation = "{{" + PlaceholderService.PROJECT_ROOT + "}}" + File.separator + "test"; createModifiableFile(resourcePath, "test/file.txt"); final Map<String, Object> placeholderData = placeholderService.makePlaceholders(); = plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/utils/CndUtilsTest.java = --- a/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/utils/CndUtilsTest.java +++ b/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/utils/CndUtilsTest.java @@ -40,6 +40,7 @@
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch bugfix/ESSENTIALS-1157
Tobias Jeger deleted branch bugfix/ESSENTIALS-1157 at cms-community / hippo-essentials --- 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-essentials][master] ESSENTIALS-1157 Fix failing unit tests on Windows
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 12a1a99c by Tobias Jeger at 2018-01-29T12:53:09+01:00 ESSENTIALS-1157 Fix failing unit tests on Windows - - - - - 3 changed files: - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ContentTypeServiceImplTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ProjectServiceImplTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/WebXmlServiceImplTest.java Changes: = plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ContentTypeServiceImplTest.java = --- a/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ContentTypeServiceImplTest.java +++ b/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ContentTypeServiceImplTest.java @@ -101,7 +101,7 @@ public class ContentTypeServiceImplTest extends BaseRepositoryTest { assertEquals("ContentType{fullName='testnamespace:compoundWithBean', name='compoundWithBean', prefix='testnamespace', mixin=false, compoundType=true, superTypes=[]}", cts.get(0).toString()); assertFalse(cts.get(0).isDraftMode()); assertEquals("Compound.java", cts.get(0).getJavaName()); -assertEquals("/path/to/Compound.java", cts.get(0).getFullPath()); +assertEquals(Paths.get("/path/to/Compound.java").toString(), cts.get(0).getFullPath()); assertEquals("testnamespace:compoundWithBean", cts.get(0).getDisplayName()); assertEquals("ContentType{fullName='testnamespace:compoundWithoutBean', name='compoundWithoutBean', prefix='testnamespace', mixin=false, compoundType=true, superTypes=[]}", cts.get(1).toString()); = plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ProjectServiceImplTest.java = --- a/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ProjectServiceImplTest.java +++ b/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ProjectServiceImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017-2018 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. @@ -25,6 +25,7 @@ import org.junit.Test; import org.onehippo.cms7.essentials.ResourceModifyingTest; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class ProjectServiceImplTest extends ResourceModifyingTest { @@ -39,6 +40,8 @@ public class ProjectServiceImplTest extends ResourceModifyingTest { List fileNames = projectService.getLog4j2Files().stream().map(File::getName).collect(Collectors.toList()); -assertEquals(Arrays.asList("log4j2.xml", "log4j2-foo.xml"), fileNames); +assertEquals(2, fileNames.size()); +assertTrue(fileNames.contains("log4j2.xml")); +assertTrue(fileNames.contains("log4j2-foo.xml")); } } = plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/WebXmlServiceImplTest.java = --- a/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/WebXmlServiceImplTest.java +++ b/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/WebXmlServiceImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017-2018 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. @@ -30,13 +30,17 @@ import org.onehippo.cms7.essentials.dashboard.model.TargetPom; import org.onehippo.cms7.essentials.dashboard.service.WebXmlService; import org.onehippo.cms7.essentials.dashboard.utils.Dom4JUtils; import org.onehippo.testutils.log4j.Log4jInterceptor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; public class WebXmlServiceImplTest extends ResourceModifyingTest { +private static final Logger LOG = LoggerFactory.getLogger(WebXmlServiceImplTest.class); private static final String SITE_WEB_XML = "site/src/main/webapp/WEB-INF/web.xml";
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-1157
Tobias Jeger pushed new branch bugfix/ESSENTIALS-1157 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/bugfix/ESSENTIALS-1157 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-essentials][feature/ESSENTIALS-1137] ESSENTIALS-1137 Remove unused 'packageClass' from PluginDescriptor API
Tobias Jeger pushed to branch feature/ESSENTIALS-1137 at cms-community / hippo-essentials Commits: c13f1b00 by Tobias Jeger at 2018-01-21T22:52:56+01:00 ESSENTIALS-1137 Remove unused packageClass from PluginDescriptor API - - - - - 2 changed files: - dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/Plugin.java - plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/sdk/api/rest/PluginDescriptor.java Changes: = dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/Plugin.java = --- a/dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/Plugin.java +++ b/dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/Plugin.java @@ -84,34 +84,20 @@ public class Plugin { } public boolean hasGeneralizedSetUp() { -return StringUtils.hasText(getDescriptor().getPackageFile()) -|| StringUtils.hasText(getDescriptor().getPackageClass()); +return StringUtils.hasText(getDescriptor().getPackageFile()); } public DefaultInstructionPackage makeInstructionPackageInstance() { -DefaultInstructionPackage instructionPackage = null; - -// Prefers packageClass over packageFile. -final String packageClass = descriptor.getPackageClass(); -if (!Strings.isNullOrEmpty(packageClass)) { -instructionPackage = GlobalUtils.newInstance(packageClass); -if (instructionPackage == null) { -log.warn("Can't create instance for instruction package class {}", packageClass); -} -} - -if (instructionPackage == null) { -final String packageFile = descriptor.getPackageFile(); -if (!Strings.isNullOrEmpty(packageFile)) { -instructionPackage = GlobalUtils.newInstance(DefaultInstructionPackage.class); +final String packageFile = descriptor.getPackageFile(); +if (!Strings.isNullOrEmpty(packageFile)) { +final DefaultInstructionPackage instructionPackage = GlobalUtils.newInstance(DefaultInstructionPackage.class); +if (instructionPackage != null) { instructionPackage.setInstructionPath(packageFile); +injector.autowireBean(instructionPackage); +return instructionPackage; } } - -if (instructionPackage != null) { -injector.autowireBean(instructionPackage); -} -return instructionPackage; +return null; } @Override = plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/sdk/api/rest/PluginDescriptor.java = --- a/plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/sdk/api/rest/PluginDescriptor.java +++ b/plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/sdk/api/rest/PluginDescriptor.java @@ -39,7 +39,6 @@ public class PluginDescriptor { private String description; private List imageUrls; private String id; -private String packageClass; private boolean hasConfiguration; private boolean noRebuildAfterSetup; private boolean setupParameters = true; // for plugins with no setup parameters, the setup phase can always be triggered automatically @@ -109,14 +108,6 @@ public class PluginDescriptor { this.packageFile = packageFile; } -public String getPackageClass() { -return packageClass; -} - -public void setPackageClass(final String packageClass) { -this.packageClass = packageClass; -} - public void setHasConfiguration(final boolean hasConfiguration) { this.hasConfiguration = hasConfiguration; } View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/c13f1b0037ca354a7210550d13f63a633b257261 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/c13f1b0037ca354a7210550d13f63a633b257261 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-essentials][feature/ESSENTIALS-1137] ESSENTIALS-1137 Remove RebuildService#getRequestingPluginIds from API
Tobias Jeger pushed to branch feature/ESSENTIALS-1137 at cms-community / hippo-essentials Commits: d95840d8 by Tobias Jeger at 2018-01-21T22:22:22+01:00 ESSENTIALS-1137 Remove RebuildService#getRequestingPluginIds from API this method is only used by (and intended for) the dashboard. - - - - - 4 changed files: - dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java - plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/sdk/api/service/RebuildService.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/RebuildServiceImpl.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/RebuildServiceImplTest.java Changes: = dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java = --- a/dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java +++ b/dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java @@ -43,14 +43,14 @@ import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.onehippo.cms7.essentials.WebUtils; import org.onehippo.cms7.essentials.filters.EssentialsContextListener; -import org.onehippo.cms7.essentials.sdk.api.rest.PluginDescriptor; import org.onehippo.cms7.essentials.plugin.sdk.rest.RestfulList; -import org.onehippo.cms7.essentials.sdk.api.service.ProjectService; -import org.onehippo.cms7.essentials.sdk.api.service.RebuildService; +import org.onehippo.cms7.essentials.plugin.sdk.services.RebuildServiceImpl; import org.onehippo.cms7.essentials.plugin.sdk.services.SettingsServiceImpl; import org.onehippo.cms7.essentials.plugin.sdk.utils.GlobalUtils; import org.onehippo.cms7.essentials.rest.client.RestClient; import org.onehippo.cms7.essentials.rest.model.SystemInfo; +import org.onehippo.cms7.essentials.sdk.api.rest.PluginDescriptor; +import org.onehippo.cms7.essentials.sdk.api.service.ProjectService; import org.onehippo.cms7.essentials.servlet.DynamicRestPointsApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,7 +69,7 @@ public class PluginStore { private static Logger log = LoggerFactory.getLogger(PluginStore.class); private DynamicRestPointsApplication application = new DynamicRestPointsApplication(); -@Inject private RebuildService rebuildService; +@Inject private RebuildServiceImpl rebuildService; @Inject private ProjectService projectService; @Inject private SettingsServiceImpl settingsService; @Inject private AutowireCapableBeanFactory injector; = plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/sdk/api/service/RebuildService.java = --- a/plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/sdk/api/service/RebuildService.java +++ b/plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/sdk/api/service/RebuildService.java @@ -30,9 +30,4 @@ public interface RebuildService { * @param pluginId identifies the requesting plugin */ void requestRebuild(String pluginId); - -/** - * Retrieve a set of plugin IDs requesting a rebuild and restart. - */ -Set getRequestingPluginIds(); } = plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/RebuildServiceImpl.java = --- a/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/RebuildServiceImpl.java +++ b/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/plugin/sdk/services/RebuildServiceImpl.java @@ -33,7 +33,6 @@ public class RebuildServiceImpl implements RebuildService { pluginIds.add(pluginId); } -@Override public Set getRequestingPluginIds() { return new HashSet<>(pluginIds); } = plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/RebuildServiceImplTest.java = --- a/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/RebuildServiceImplTest.java +++ b/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/RebuildServiceImplTest.java @@ -26,7 +26,7 @@ public class RebuildServiceImplTest { @Test public void collect_plugin_ids() { -final RebuildService rebuildService = new RebuildServiceImpl(); +final RebuildServiceImpl rebuildService = new RebuildServiceImpl(); assertTrue(rebuildService.getRequestingPluginIds().isEmpty()); View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/d95840d831ce360ba844abeb9aec5933886ae461 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-1137
Tobias Jeger pushed new branch feature/ESSENTIALS-1137 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1137 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-essentials][master] ESSENTIALS-1106 Fix regression
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 448b35d0 by Tobias Jeger at 2018-01-16T23:23:47+01:00 ESSENTIALS-1106 Fix regression - - - - - 1 changed file: - plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html Changes: = plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html = --- a/plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html +++ b/plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html @@ -47,7 +47,7 @@ end-point="{{endpoint}}"/> - View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/448b35d0cf79fa2a5908a60d9c54a7417d15f8bd --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/448b35d0cf79fa2a5908a60d9c54a7417d15f8bd 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-essentials] Deleted branch feature/ESSENTIALS-1141
Tobias Jeger deleted branch feature/ESSENTIALS-1141 at cms-community / hippo-essentials --- 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-essentials] Deleted branch feature/ESSENTIALS-1142
Tobias Jeger deleted branch feature/ESSENTIALS-1142 at cms-community / hippo-essentials --- 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-essentials] Deleted branch feature/ESSENTIALS-1139
Tobias Jeger deleted branch feature/ESSENTIALS-1139 at cms-community / hippo-essentials --- 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-essentials] Deleted branch feature/ESSENTIALS-1140
Tobias Jeger deleted branch feature/ESSENTIALS-1140 at cms-community / hippo-essentials --- 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-essentials] Deleted branch feature/ESSENTIALS-1135
Tobias Jeger deleted branch feature/ESSENTIALS-1135 at cms-community / hippo-essentials --- 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-essentials] Deleted branch feature/ESSENTIALS-1138
Tobias Jeger deleted branch feature/ESSENTIALS-1138 at cms-community / hippo-essentials --- 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-essentials][master] 4 commits: ESSENTIALS-1140 Refactor DocumentTemplateUtils into ContentTypeService
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 234e0868 by Tobias Jeger at 2018-01-02T15:59:16+01:00 ESSENTIALS-1140 Refactor DocumentTemplateUtils into ContentTypeService DocumentTypeUtils provided 2 methods used when adding document type fields to document types. These have been integrated in Essentials ContentTypeService. - - - - - 8740d518 by Tobias Jeger at 2018-01-02T21:20:34+01:00 ESSENTIALS-1140 Refactor related documents REST API to use explicit model This refactoring avoids quirky usage of the generic PostPayload class, making the code more explicit and maintainable. It also gets rid of the last non-API dependency in the REST resource, the plugin now only depends in the API (and JAX-RS). - - - - - 08382b3e by Tobias Jeger at 2018-01-02T23:29:33+01:00 ESSENTIALS-1140 Fix confirm mode if plugin has no setup parameters By default, confirm mode is off, and all plugins use the globally configured generalized parameter (jsp or freemarker, sampleData and extraTemplates). Due to the removal of the ParameterService support, plugins with no setup parameters started to exhibit incorrect installation behaviour in confirm mode. These changes fix this problem by introducing a new plugin descriptor flag setupParameters, which is true by default. If a plugin has no setup parameters, it declares setupParameters: false in the plugin descriptor, such that it does not need to provide a front-end template for manually triggering the setup phase. A few more recent plugins actually had such a dummy template, which has become superfluous now. - - - - - e06c6726 by Tobias Jeger at 2018-01-11T19:41:52+01:00 ESSENTIALS-1140 Reintegrate feature/ESSENTIALS-1140 - - - - - 30 changed files: - dashboard/src/main/java/org/onehippo/cms7/essentials/rest/PluginResource.java - plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptor.java - plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/service/ContentTypeService.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/ContentTypeServiceImpl.java - − plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/DocumentTemplateUtils.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ContentTypeServiceImplTest.java - plugins/banner-and-carousel/src/main/resources/plugin-descriptor.json - plugins/content-blocks/src/main/resources/plugin-descriptor.json - plugins/document-wizard/src/main/resources/META-INF/resources/feature/documentWizardPlugin/documentWizardPlugin.html - plugins/document-wizard/src/main/resources/META-INF/resources/feature/documentWizardPlugin/documentWizardPlugin.js - plugins/document-wizard/src/main/resources/plugin-descriptor.json - − plugins/enterprise-project/src/main/resources/META-INF/resources/feature/enterpriseProject/enterpriseProject.html - plugins/enterprise-project/src/main/resources/plugin-descriptor.json - plugins/events/src/main/resources/plugin-descriptor.json - plugins/faq/src/main/resources/plugin-descriptor.json - plugins/google-maps/src/main/resources/plugin-descriptor.json - plugins/image-component/src/main/resources/plugin-descriptor.json - plugins/list/src/main/resources/plugin-descriptor.json - − plugins/lucene-index-exporter/src/main/resources/META-INF/resources/feature/luceneIndexExporter/luceneIndexExporter.html - plugins/lucene-index-exporter/src/main/resources/plugin-descriptor.json - plugins/menu/src/main/resources/plugin-descriptor.json - plugins/news/src/main/resources/plugin-descriptor.json - plugins/poll/src/main/resources/plugin-descriptor.json - − plugins/projects/src/main/resources/META-INF/resources/feature/relevancePlugin/projectsPlugin.html - plugins/projects/src/main/resources/plugin-descriptor.json - plugins/related-documents/pom.xml - plugins/related-documents/src/main/java/org/onehippo/cms7/essentials/plugins/relateddocuments/RelatedDocumentsResource.java - + plugins/related-documents/src/main/java/org/onehippo/cms7/essentials/plugins/relateddocuments/model/Configuration.java - plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html - plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.js The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/d5fb11b35db85a4f959cc99faea5f3b35c502676...e06c6726afb5889f3ccbedc04db3a2485a7bf7b6 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/d5fb11b35db85a4f959cc99faea5f3b35c502676...e06c6726afb5889f3ccbedc04db3a2485a7bf7b6 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] 13 commits: ESSENTIALS-1135 Remove obsolete (unused) data structures
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: c8e3a049 by Tobias Jeger at 2017-12-22T15:56:45+01:00 ESSENTIALS-1135 Remove obsolete (unused) data structures - And turn remaining structures into simple data beans - - - - - 6eb38f17 by Tobias Jeger at 2017-12-22T15:56:46+01:00 ESSENTIALS-1135 Introduce UserFeedback and refactor dynamic REST app - Feedback to a users action in the dashboard was hidden inside a generic data structure in the response to (typically) POST requests, the MessageRestful or a RestfulListMessageRestful. The front-end then poked around in the response data and did a best guess at which responses contain user feedback, to be displayed in the dashboards user feedback header. Introducing the UserFeedback makes this more explicit and comprehensible. UserFeedback encapsulates potentially multiple messages, and provides them to the front-end in a more explicit manner. - DynamicRestPointsApplication (which registers the plugins /dynamic REST endpoints) has been refactored to instantiate singletons for all REST endpoints, which are then Spring-injected explicitly before being registered with the JAXRS Application. Like this, Spring injection doesnt leak into the plugin SDK API, and resource classes do no longer need to extend from BaseResource. Using singletons does mean that resource classes must be stateless / thread-safe. All currently existing Plugin-based REST resource classes meet this requirement without adjustment. - - - - - 03477578 by Tobias Jeger at 2017-12-22T15:56:46+01:00 ESSENTIALS-1135 Rename ContentBeansService to ContentBeansServiceImpl - - - - - f501b9a1 by Tobias Jeger at 2017-12-22T15:56:46+01:00 ESSENTIALS-1135 Make ContentBeansService(Impl) injectable ContentBeansService implemented an intricate logic for accumulating user feedback messages (as BeanWriterLogEntry) in a dedicated magic field of the PluginContext, only to rewrite them immediately in the BeanWriterUtils. I refactored ContentBeansService to directly and consistently add user feedback messages to the passed-in UserFeedback instance. Also, the PluginContext no longer needs to be provided in the constructor, which made ownership and control of the contexts life- cycle unnecessarily complicated. Instead, the caller owns the context and passes it in through the API. ContentBeansService still is an overly complex and under unit-tested class. While the new interface describes the current API, the API is still too ugly to freeze, which is why I keep it in the implementation module for now. - - - - - c9896261 by Tobias Jeger at 2017-12-22T15:56:46+01:00 ESSENTIALS-1135 Remove unused code - - - - - b07aa282 by Tobias Jeger at 2017-12-22T15:56:46+01:00 ESSENTIALS-1135 Refactor JCR low-level access into JcrService This change removes the dependency on the JCR-related methods of the GlobalUtils by making them available through the injectable JcrService. As many of the unit tests (sub-classes of BaseRepositoryTest) depend on a custom access to the repository, this change involves some serious refactoring in the testing infrastructure, to make sure there is only a single instance (singleton) of the JcrService used throughout the Spring application. In the unit-test context, the TestJcrService plays that role. - - - - - 1621ac15 by Tobias Jeger at 2017-12-25T08:41:17+01:00 ESSENTIALS-1135 Create injectable Essentials ContentTypeService to replace the old ContentTypeServiceUtils. Clean up HippoNodeUtils (lots of unused code). Replace DocumentRestful (implementation) with ContentType (API). - - - - - bb706f90 by Tobias Jeger at 2017-12-26T08:56:17+01:00 ESSENTIALS-1135 Embed Vendor info in PluginDescriptor The separate Vendor bean was is only used in the context of a PluginDescriptor. It therefore seems cleaner to keep it as an inner class. I also noticed that the unit test for the [de-]serialization of PluginDescriptor lived in the dashboard, while the descriptor lives in the API. I moved the unit test into the API module, rearranging some Maven dependencies. - - - - - 546bd055 by Tobias Jeger at 2017-12-26T16:19:57+01:00 ESSENTIALS-1135 Add import of interpolated resource to JcrService Importing a classpath XML file (after {{moustache}} interpolation) into the JCR repository is a frequently-seen pattern in Essentials plugins. By adding support for this pattern to the JcrService, the direct dependency of a plugin on the TemplateUtils is removed, without having to expose them through the API. All in all, the Content Blocks plugin now no longer depends on the plugin-sdk implementation module. Hurray! - - - - - fb2a43d4 by Tobias Jeger at 2017-12-27T16:26:20+01:00 ESSENTIALS-1135 Add unit test for JcrService I noticed that the BaseRepositoryTest-derived unit tests of the SDK implementation module were quite slow, because they reinitialized a new repository for every test case, including importing 10+ namespaces. By refactoring the MemoryRepository class in order
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-1142
Tobias Jeger pushed new branch feature/ESSENTIALS-1142 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1142 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-essentials] Pushed new branch feature/ESSENTIALS-1141
Tobias Jeger pushed new branch feature/ESSENTIALS-1141 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1141 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-essentials] Pushed new branch feature/ESSENTIALS-1140
Tobias Jeger pushed new branch feature/ESSENTIALS-1140 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1140 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-essentials] Pushed new branch feature/ESSENTIALS-1139
Tobias Jeger pushed new branch feature/ESSENTIALS-1139 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1139 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-essentials] Pushed new branch feature/ESSENTIALS-1138
Tobias Jeger pushed new branch feature/ESSENTIALS-1138 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1138 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-essentials][feature/ESSENTIALS-1135] 4 commits: ESSENTIALS-1135 Create injectable Essentials ContentTypeService
Tobias Jeger pushed to branch feature/ESSENTIALS-1135 at cms-community / hippo-essentials Commits: 1621ac15 by Tobias Jeger at 2017-12-25T08:41:17+01:00 ESSENTIALS-1135 Create injectable Essentials ContentTypeService to replace the old ContentTypeServiceUtils. Clean up HippoNodeUtils (lots of unused code). Replace DocumentRestful (implementation) with ContentType (API). - - - - - bb706f90 by Tobias Jeger at 2017-12-26T08:56:17+01:00 ESSENTIALS-1135 Embed Vendor info in PluginDescriptor The separate Vendor bean was is only used in the context of a PluginDescriptor. It therefore seems cleaner to keep it as an inner class. I also noticed that the unit test for the [de-]serialization of PluginDescriptor lived in the dashboard, while the descriptor lives in the API. I moved the unit test into the API module, rearranging some Maven dependencies. - - - - - 546bd055 by Tobias Jeger at 2017-12-26T16:19:57+01:00 ESSENTIALS-1135 Add import of interpolated resource to JcrService Importing a classpath XML file (after {{moustache}} interpolation) into the JCR repository is a frequently-seen pattern in Essentials plugins. By adding support for this pattern to the JcrService, the direct dependency of a plugin on the TemplateUtils is removed, without having to expose them through the API. All in all, the Content Blocks plugin now no longer depends on the plugin-sdk implementation module. Hurray! - - - - - fb2a43d4 by Tobias Jeger at 2017-12-27T16:26:20+01:00 ESSENTIALS-1135 Add unit test for JcrService I noticed that the BaseRepositoryTest-derived unit tests of the SDK implementation module were quite slow, because they reinitialized a new repository for every test case, including importing 10+ namespaces. By refactoring the MemoryRepository class in order to only instantiate a new repository once, and resetting its nodes only if a new test case uses a Session, I managed to speed these tests up by a factor of ~5. - - - - - 30 changed files: - dashboard-dependencies/pom.xml - dashboard/src/main/java/org/onehippo/cms7/essentials/WebUtils.java - dashboard/src/main/java/org/onehippo/cms7/essentials/rest/DocumentResource.java - plugin-sdk/api/pom.xml - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/model/DocumentRestful.java → plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/ContentType.java - plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptor.java - − plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/Vendor.java - + plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/service/ContentTypeService.java - plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/service/JcrService.java - dashboard/src/test/java/org/onehippo/cms7/essentials/rest/model/PluginDescriptorTest.java → plugin-sdk/api/src/test/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptorTest.java - plugin-sdk/implementation/pom.xml - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/ContentBeansService.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/ContentBeansServiceImpl.java - + plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/ContentTypeServiceImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/JcrServiceImpl.java - − plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/ContentTypeServiceUtils.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/HippoNodeUtils.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/TemplateUtils.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/BaseRepositoryTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/MemoryRepository.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/TestJcrService.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/rest/BaseResourceTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/rest/RestfulListTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ContentBeansServiceTest.java - + plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/JcrServiceImplTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/utils/HippoNodeUtilsTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/utils/HstUtilsTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/utils/TemplateUtilsTest.java - + plugin-sdk/implementation/src/test/resources/services/jcr/testdocument.xml - plugin-sdk/pom.xml The diff
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-1135
Tobias Jeger pushed new branch feature/ESSENTIALS-1135 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1135 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-essentials][feature/ESSENTIALS-1132] ESSENTIALS-1132 Enable plugins with no rebuild requirement
Tobias Jeger pushed to branch feature/ESSENTIALS-1132 at cms-community / hippo-essentials Commits: 38298592 by Tobias Jeger at 2017-12-13T12:06:35+01:00 ESSENTIALS-1132 Enable plugins with no rebuild requirement - - - - - 2 changed files: - dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/InstallStateMachine.java - plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptor.java Changes: = dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/InstallStateMachine.java = --- a/dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/InstallStateMachine.java +++ b/dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/InstallStateMachine.java @@ -76,9 +76,13 @@ class InstallStateMachine { throw new PluginException("Incorrect state to run setup."); } -// For now, all plugins require a rebuild after the setup phase. -log.info("Setting to Installing for plugin " + plugin); -state = InstallState.INSTALLING; +if (plugin.getDescriptor().isNoRebuildAfterSetup()) { +log.info("Setting to Installed for plugin " + plugin); +state = InstallState.INSTALLED; +} else { +log.info("Setting to Installing for plugin " + plugin); +state = InstallState.INSTALLING; +} persistState(); return state; = plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptor.java = --- a/plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptor.java +++ b/plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptor.java @@ -40,7 +40,8 @@ public class PluginDescriptor implements Restful { private List imageUrls; private String id; private String packageClass; -private boolean hasConfiguration = false; +private boolean hasConfiguration; +private boolean noRebuildAfterSetup; private String packageFile; private String type; private String installState; @@ -122,6 +123,14 @@ public class PluginDescriptor implements Restful { public boolean getHasConfiguration() { return hasConfiguration; } + +public boolean isNoRebuildAfterSetup() { +return noRebuildAfterSetup; +} + +public void setNoRebuildAfterSetup(final boolean noRebuildAfterSetup) { +this.noRebuildAfterSetup = noRebuildAfterSetup; +} public Vendor getVendor() { return vendor; View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/38298592c5d4d06247425dc9d35c810ff1ec66c8 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/38298592c5d4d06247425dc9d35c810ff1ec66c8 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-essentials][feature/ESSENTIALS-1132] 5 commits: ESSENTIALS-1132 Delete PluginDescriptor interface to promote data bean
Tobias Jeger pushed to branch feature/ESSENTIALS-1132 at cms-community / hippo-essentials Commits: 624684b7 by Tobias Jeger at 2017-12-11T15:51:23+01:00 ESSENTIALS-1132 Delete PluginDescriptor interface to promote data bean - - - - - 19bfe701 by Tobias Jeger at 2017-12-11T15:53:14+01:00 ESSENTIALS-1132 Move PluginDescriptorRestful (impl) to PluginDescriptor (api) - - - - - 12539fc8 by Tobias Jeger at 2017-12-11T22:01:41+01:00 ESSENTIALS-1132 Fix EnterpriseUtils to avoid duplicate dependencies - - - - - d456134d by Tobias Jeger at 2017-12-11T22:04:28+01:00 ESSENTIALS-1132 Refactor PluginDescriptorRestful into PluginDescriptor - without dependencies on the SDK implementation module. - - - - - aa5b0177 by Tobias Jeger at 2017-12-12T11:59:00+01:00 ESSENTIALS-1132 Simplify loading of dynamic dashboard extensions The mechanism for loading the plugin-specific extensions to the dashboard AngularJS application contained a lot of unused (or no-longer- used) complexity. For better maintainability, Ive simplified the mechanism to focus on the functionality in use. This leads to further simplification of the plugin descriptor structure. - - - - - 30 changed files: - dashboard/src/main/java/org/onehippo/cms7/essentials/filters/EssentialsContextListener.java - dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java - dashboard/src/main/java/org/onehippo/cms7/essentials/rest/DocumentResource.java - dashboard/src/main/java/org/onehippo/cms7/essentials/rest/PluginResource.java - dashboard/src/main/java/org/onehippo/cms7/essentials/rest/model/RestList.java - dashboard/src/main/webapp/js/loader.js - dashboard/src/test/java/org/onehippo/cms7/essentials/WebUtilsTest.java - dashboard/src/test/java/org/onehippo/cms7/essentials/rest/model/PluginDescriptorRestfulTest.java → dashboard/src/test/java/org/onehippo/cms7/essentials/rest/model/PluginDescriptorTest.java - dashboard/src/test/resources/external_list.json - plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptor.java - − plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptorRestful.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/rest/PluginModuleRestful.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/rest/RestfulList.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/EnterpriseUtils.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/rest/BaseResourceTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/rest/PluginModuleRestfulTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/rest/RestfulListTest.java - plugins/banner-and-carousel/src/main/resources/plugin-descriptor.json - plugins/bean-writer/src/main/resources/plugin-descriptor.json - plugins/blog/src/main/resources/plugin-descriptor.json - plugins/bloomreach-connector/src/main/resources/plugin-descriptor.json - plugins/content-blocks/src/main/resources/plugin-descriptor.json - plugins/document-wizard/src/main/resources/plugin-descriptor.json - plugins/events/src/main/resources/plugin-descriptor.json - plugins/faq/src/main/resources/plugin-descriptor.json - plugins/gallery-manager/src/main/resources/plugin-descriptor.json - plugins/image-component/src/main/resources/plugin-descriptor.json - plugins/list/src/main/resources/plugin-descriptor.json - plugins/menu/src/main/resources/plugin-descriptor.json - plugins/news/src/main/resources/plugin-descriptor.json The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/f59e21a5bb76e7168f6a5f446477c01122ee9f58...aa5b0177017a8cd0ec8dbada291c08e43cfe4768 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/f59e21a5bb76e7168f6a5f446477c01122ee9f58...aa5b0177017a8cd0ec8dbada291c08e43cfe4768 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-essentials] Pushed new branch feature/ESSENTIALS-1132
Tobias Jeger pushed new branch feature/ESSENTIALS-1132 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1132 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-essentials] Deleted branch feature/ESSENTIALS-1127
Tobias Jeger deleted branch feature/ESSENTIALS-1127 at cms-community / hippo-essentials --- 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-essentials][master] 10 commits: ESSENTIALS-1127 Refactor the change message compilation to remove Guava dependency of API
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: cb9ef7f6 by Tobias Jeger at 2017-11-29T14:39:27+01:00 ESSENTIALS-1127 Refactor the change message compilation to remove Guava dependency of API - - - - - e703163a by Tobias Jeger at 2017-11-29T14:41:08+01:00 ESSENTIALS-1127 Refactor WebXmlUtils into WebXmlService Get rid of unused plugin dependencies on SDK-implementation. - - - - - 2e51cb03 by Tobias Jeger at 2017-11-29T14:41:29+01:00 ESSENTIALS-1127 Refactor Log4j2Utils to become an injectable service. - - - - - 1f3e56df by Tobias Jeger at 2017-11-30T14:53:15+01:00 ESSENTIALS-1127 Refactor ContextXmlUtils to become an injectable service Also extract some common usage patterns for updating XML files in order to reduce code duplication. - - - - - 0bbb2278 by Tobias Jeger at 2017-12-01T09:17:24+01:00 ESSENTIALS-1127 Refactor MavenAssemblyUtils to become an injectable service - - - - - 38bac71b by Tobias Jeger at 2017-12-01T12:09:09+01:00 ESSENTIALS-1127 Refactor MavenCargoUtils to become an injectable service - - - - - 3f0c8f3a by Tobias Jeger at 2017-12-03T13:26:06+01:00 ESSENTIALS-1127 Mark plugin pom to discourage depending on implementation - - - - - dd6b50c6 by Tobias Jeger at 2017-12-05T10:43:01+01:00 ESSENTIALS-1127 Fix return value of URL rewriter install instruction - - - - - a55356b4 by Tobias Jeger at 2017-12-05T12:06:16+01:00 ESSENTIALS-1127 Reduce API overhead for simple data class MavenDependency - - - - - 8196fb62 by Tobias Jeger at 2017-12-05T12:06:44+01:00 ESSENTIALS-1127 Reintegrate feature/ESSENTIALS-1127 - - - - - 30 changed files: - plugin-sdk/api/pom.xml - plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/instructions/Instruction.java - + plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/MavenDependency.java - + plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/service/ContextXmlService.java - + plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/service/LoggingService.java - + plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/service/MavenAssemblyService.java - + plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/service/MavenCargoService.java - + plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/service/ProjectService.java - plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/service/WebXmlService.java - plugin-sdk/implementation/pom.xml - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/BuiltinInstruction.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/CndInstruction.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/DirectoryInstruction.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/ExecuteInstruction.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/FileInstruction.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/HstBeanClassesInstruction.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/MavenDependencyInstruction.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/NodeFolderInstruction.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/TranslationsInstruction.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/XmlInstruction.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/executors/MessageInstructionExecutor.java - + plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/ContextXmlServiceImpl.java - + plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/LoggingServiceImpl.java - + plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/MavenAssemblyServiceImpl.java - + plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/MavenCargoServiceImpl.java - + plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/ProjectServiceImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/WebXmlServiceImpl.java - − plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/ContextXMLUtils.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/Dom4JUtils.java - − plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/Log4j2Utils.java The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][master] HIPPLUG-1145 Bump demo version after branching off CMS 12.1.
Tobias Jeger pushed to branch master at cms-community / hippo-plugin-taxonomy Commits: ee42f610 by Tobias Jeger at 2017-11-29T15:22:12+01:00 HIPPLUG-1145 Bump demo version after branching off CMS 12.1. - - - - - 5 changed files: - demo/cms/pom.xml - demo/plugin/pom.xml - demo/pom.xml - demo/repository-data/pom.xml - demo/site/pom.xml Changes: = demo/cms/pom.xml = --- a/demo/cms/pom.xml +++ b/demo/cms/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-plugin-taxonomy-demo -4.1.0-SNAPSHOT +4.2.0-SNAPSHOT Hippo Plugin Taxonomy Demo CMS = demo/plugin/pom.xml = --- a/demo/plugin/pom.xml +++ b/demo/plugin/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-plugin-taxonomy-demo -4.1.0-SNAPSHOT +4.2.0-SNAPSHOT Hippo Plugin Taxonomy Demo Plugin = demo/pom.xml = --- a/demo/pom.xml +++ b/demo/pom.xml @@ -20,12 +20,12 @@ org.onehippo.cms7 hippo-cms7-release -12.1.0-SNAPSHOT +12.2.0-SNAPSHOT Hippo Plugin Taxonomy Demo hippo-plugin-taxonomy-demo - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT pom = demo/repository-data/pom.xml = --- a/demo/repository-data/pom.xml +++ b/demo/repository-data/pom.xml @@ -19,7 +19,7 @@ org.onehippo.cms7 hippo-plugin-taxonomy-demo -4.1.0-SNAPSHOT +4.2.0-SNAPSHOT Hippo Plugin Taxonomy Demo Repository Data = demo/site/pom.xml = --- a/demo/site/pom.xml +++ b/demo/site/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-plugin-taxonomy-demo -4.1.0-SNAPSHOT +4.2.0-SNAPSHOT Hippo Plugin Taxonomy Demo Site View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/ee42f61002756e7cf09470fc028681f66b1f2e0a --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/ee42f61002756e7cf09470fc028681f66b1f2e0a 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-selections][master] HIPPLUG-1145 Bump demo versions after branching for CMS 12.1.
Tobias Jeger pushed to branch master at cms-community / hippo-plugin-selections Commits: 849cdfa4 by Tobias Jeger at 2017-11-29T15:18:37+01:00 HIPPLUG-1145 Bump demo versions after branching for CMS 12.1. - - - - - 4 changed files: - demo/cms/pom.xml - demo/pom.xml - demo/repository-data/pom.xml - demo/site/pom.xml Changes: = demo/cms/pom.xml = --- a/demo/cms/pom.xml +++ b/demo/cms/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-plugin-selections-demo -5.0.0-SNAPSHOT +5.2.0-SNAPSHOT Hippo Plugin Selections Demo Project CMS = demo/pom.xml = --- a/demo/pom.xml +++ b/demo/pom.xml @@ -20,13 +20,13 @@ org.onehippo.cms7 hippo-cms7-release -12.1.0-SNAPSHOT +12.2.0-SNAPSHOT Hippo Plugin Selections Demo Project Hippo Plugin Selections Demo Project hippo-plugin-selections-demo - 5.0.0-SNAPSHOT + 5.2.0-SNAPSHOT pom = demo/repository-data/pom.xml = --- a/demo/repository-data/pom.xml +++ b/demo/repository-data/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-plugin-selections-demo -5.0.0-SNAPSHOT +5.2.0-SNAPSHOT Hippo Plugin Selections Demo Repository Data = demo/site/pom.xml = --- a/demo/site/pom.xml +++ b/demo/site/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-plugin-selections-demo -5.0.0-SNAPSHOT +5.2.0-SNAPSHOT Hippo Plugin Selections Demo Project Site View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-selections/commit/849cdfa42fa820d15479b7da639cfe8155a14cc7 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-selections/commit/849cdfa42fa820d15479b7da639cfe8155a14cc7 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-content-blocks][master] HIPPLUG-1145 Bump demo version after creating 12.1 branches
Tobias Jeger pushed to branch master at cms-community / hippo-plugin-content-blocks Commits: 55710ab0 by Tobias Jeger at 2017-11-29T15:09:45+01:00 HIPPLUG-1145 Bump demo version after creating 12.1 branches - - - - - 4 changed files: - demo/cms/pom.xml - demo/pom.xml - demo/repository-data/pom.xml - demo/site/pom.xml Changes: = demo/cms/pom.xml = --- a/demo/cms/pom.xml +++ b/demo/cms/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7.content-blocks-demo hippo-plugin-content-blocks-demo -4.0.0-SNAPSHOT +4.2.0-SNAPSHOT Hippo Plugin Content Blocks Demo CMS = demo/pom.xml = --- a/demo/pom.xml +++ b/demo/pom.xml @@ -20,14 +20,14 @@ org.onehippo.cms7 hippo-cms7-release -12.1.0-SNAPSHOT +12.2.0-SNAPSHOT Hippo Plugin Content Blocks Demo Demo for the Hippo Plugin Content Blocks org.onehippo.cms7.content-blocks-demo hippo-plugin-content-blocks-demo - 4.0.0-SNAPSHOT + 4.2.0-SNAPSHOT pom = demo/repository-data/pom.xml = --- a/demo/repository-data/pom.xml +++ b/demo/repository-data/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7.content-blocks-demo hippo-plugin-content-blocks-demo -4.0.0-SNAPSHOT +4.2.0-SNAPSHOT Hippo Plugin Content Blocks Demo Repository Data = demo/site/pom.xml = --- a/demo/site/pom.xml +++ b/demo/site/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7.content-blocks-demo hippo-plugin-content-blocks-demo -4.0.0-SNAPSHOT +4.2.0-SNAPSHOT Hippo Plugin Content Blocks Demo Site View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-content-blocks/commit/55710ab02b8c32df3941ee9af851c64243707a74 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-content-blocks/commit/55710ab02b8c32df3941ee9af851c64243707a74 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-dashboard-document-wizard][master] HIPPLUG-1145 Bump demo version after 12.1 branching
Tobias Jeger pushed to branch master at cms-community / hippo-plugin-dashboard-document-wizard Commits: 3e3d1384 by Tobias Jeger at 2017-11-29T14:57:50+01:00 HIPPLUG-1145 Bump demo version after 12.1 branching - - - - - 4 changed files: - demo/cms/pom.xml - demo/pom.xml - demo/repository-data/pom.xml - demo/site/pom.xml Changes: = demo/cms/pom.xml = --- a/demo/cms/pom.xml +++ b/demo/cms/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7.dashboard-document-wizard-demo hippo-plugin-dashboard-document-wizard-demo -4.0.1-SNAPSHOT +4.2.0-SNAPSHOT Hippo Plugin Dashboard Document Wizard Demo CMS = demo/pom.xml = --- a/demo/pom.xml +++ b/demo/pom.xml @@ -20,14 +20,14 @@ org.onehippo.cms7 hippo-cms7-release -12.1.0-SNAPSHOT +12.2.0-SNAPSHOT Hippo Plugin Dashboard Document Wizard Demo Hippo Plugin Dashboard Document Wizard Demo org.onehippo.cms7.dashboard-document-wizard-demo hippo-plugin-dashboard-document-wizard-demo - 4.0.1-SNAPSHOT + 4.2.0-SNAPSHOT pom = demo/repository-data/pom.xml = --- a/demo/repository-data/pom.xml +++ b/demo/repository-data/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7.dashboard-document-wizard-demo hippo-plugin-dashboard-document-wizard-demo -4.0.1-SNAPSHOT +4.2.0-SNAPSHOT Hippo Plugin Dashboard Document Wizard Demo Repository Data = demo/site/pom.xml = --- a/demo/site/pom.xml +++ b/demo/site/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7.dashboard-document-wizard-demo hippo-plugin-dashboard-document-wizard-demo -4.0.1-SNAPSHOT +4.2.0-SNAPSHOT Hippo Plugin Dashboard Document Wizard Demo Site View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-dashboard-document-wizard/commit/3e3d13842a2188c7f7d4692c2bb52cfdaadcd7ba --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-dashboard-document-wizard/commit/3e3d13842a2188c7f7d4692c2bb52cfdaadcd7ba 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-essentials][master] 5 commits: ESSENTIALS-1119 Add "built-in" instruction for adding mvn dependency
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 80aef3cf by Tobias Jeger at 2017-11-27T16:27:50+01:00 ESSENTIALS-1119 Add built-in instruction for adding mvn dependency - use this instruction rather than custom instruction classes - fix the casing of the hst-bean-classes built-in instruction - make the SDK utilities more robust against missing files or data - remove now-superfluous ParameterService classes - remove unused class FrontendPluginBuilder - - - - - 1cd8ad39 by Tobias Jeger at 2017-11-27T16:27:51+01:00 ESSENTIALS-1119 Refactor SEO plugin to use mavenDependency instruction Doing so removes the need to rebuild twice when installing this feature. - - - - - 6c7185e2 by Tobias Jeger at 2017-11-27T16:27:51+01:00 ESSENTIALS-1119 Refactor some plugins to use mavenDependency instructions - - - - - c60cc40e by Tobias Jeger at 2017-11-27T17:08:59+01:00 ESSENTIALS-1119 Refactor BR plugins to use mavenDependency instructions this shaves off the need for a few rebuilds. - - - - - 0bfc2861 by Tobias Jeger at 2017-11-29T09:55:00+01:00 ESSENTIALS-1119 Reintegrate feature/ESSENTIALS-1119-rebased - - - - - 30 changed files: - plugin-sdk/api/src/main/resources/instructions.xsd - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/HstBeanClassesInstruction.java - + plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/MavenDependencyInstruction.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/PluginInstructionSet.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/packaging/DefaultInstructionPackage.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/DependencyUtils.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/MavenCargoUtils.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/ProjectUtils.java - + plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/instruction/MavenDependencyInstructionTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/instruction/executors/MessageInstructionExecutorTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/instruction/parser/DefaultInstructionParserTest.java - + plugin-sdk/implementation/src/test/resources/instructions/maven-dependency/pom.xml - plugin-sdk/implementation/src/test/resources/parser_instructions.xml - plugins/banner-and-carousel/pom.xml - plugins/bloomreach-connector/src/main/java/org/onehippo/cms7/essentials/bloomreach/connector/rest/BloomreachConnectorResource.java - plugins/bloomreach-connector/src/main/resources/plugin-descriptor.json - plugins/commerce-detail/src/main/resources/META-INF/commerce-detail_instructions.xml - plugins/commerce-detail/src/main/resources/plugin-descriptor.json - plugins/commerce-more-like-this/src/main/resources/META-INF/commerce-more-like-this_instructions.xml - plugins/commerce-more-like-this/src/main/resources/plugin-descriptor.json - plugins/commerce-product-grid/src/main/resources/META-INF/commerce-product-grid_instructions.xml - plugins/commerce-product-grid/src/main/resources/plugin-descriptor.json - plugins/commerce-search-box/src/main/resources/META-INF/commerce-search-box_instructions.xml - plugins/commerce-search-box/src/main/resources/plugin-descriptor.json - plugins/commerce-search-results-category/src/main/resources/META-INF/commerce-search-results-category_instructions.xml - plugins/commerce-search-results-category/src/main/resources/plugin-descriptor.json - plugins/commerce-search-results-products/src/main/resources/META-INF/commerce-search-results-products_instructions.xml - plugins/commerce-search-results-products/src/main/resources/plugin-descriptor.json - plugins/content-blocks/src/main/java/org/onehippo/cms7/essentials/plugins/contentblocks/ContentBlocksParameterService.java - + plugins/content-blocks/src/main/resources/META-INF/content_blocks_plugin_instructions.xml The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/625a6bea1e6ff1df413f79b8da8469929a95ed47...0bfc286115cd3580bd1d654b91934a0bd6e444d0 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/625a6bea1e6ff1df413f79b8da8469929a95ed47...0bfc286115cd3580bd1d654b91934a0bd6e444d0 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-essentials] Deleted branch feature/ESSENTIALS-1119-rebased
Tobias Jeger deleted branch feature/ESSENTIALS-1119-rebased at cms-community / hippo-essentials --- 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-essentials] Deleted branch feature/ESSENTIALS-1117
Tobias Jeger deleted branch feature/ESSENTIALS-1117 at cms-community / hippo-essentials --- 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-essentials] Deleted branch feature/ESSENTIALS-1118
Tobias Jeger deleted branch feature/ESSENTIALS-1118 at cms-community / hippo-essentials --- 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-essentials] Deleted branch feature/ESSENTIALS-1123
Tobias Jeger deleted branch feature/ESSENTIALS-1123 at cms-community / hippo-essentials --- 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-essentials] Deleted branch bugfix/ESSENTIALS-1125
Tobias Jeger deleted branch bugfix/ESSENTIALS-1125 at cms-community / hippo-essentials --- 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-essentials][master] 3 commits: ESSENTIALS-1125 Fix plugin licensing (auto-suggest plugin)
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: fc663198 by Marijan Milicevic at 2017-11-27T13:38:14+01:00 ESSENTIALS-1125 Fix plugin licensing (auto-suggest plugin) - add license for jquery typeahead plugin - - - - - c903a1e3 by Tobias Jeger at 2017-11-27T15:25:57+01:00 ESSENTIALS-1125 Fewer blank lines for consistent spacing. - - - - - a3d7a1bb by Tobias Jeger at 2017-11-27T15:27:56+01:00 ESSENTIALS-1125 Reintegrate bugfix/ESSENTIALS-1125 - - - - - 2 changed files: - LICENSE - + plugins/commerce-search-box/src/main/appended-resources/META-INF/LICENSE Changes: = LICENSE = --- a/LICENSE +++ b/LICENSE @@ -284,3 +284,31 @@ plugins/skeleton-package/src/main/resources/instructions/js/jquery-2.1.0.min.js LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + + + +plugins/commerce-search-box/src/main/resources/js/jquery.typeahead.min.js +plugins/commerce-search-box/src/main/resources/css/jquery.typeahead.min.css + +The MIT License (MIT) + +Copyright (c) 2015 tombertrand + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file = plugins/commerce-search-box/src/main/appended-resources/META-INF/LICENSE = --- /dev/null +++ b/plugins/commerce-search-box/src/main/appended-resources/META-INF/LICENSE @@ -0,0 +1,31 @@ + +=== +Commerce Search Box plugin includes a number of sub-components with separate +copyright notices and license terms. Your use of the code for the these sub-components +is subject to the terms and conditions of the following licenses: + + +css/jquery.typeahead.min.css +js/jquery.typeahead.min.js + +The MIT License (MIT) + +Copyright (c) 2015 tombertrand + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/caeb4629dcefc9f2280144288ce6b9687664394f...a3d7a1bb932a752257f7eb59eb2df5a8c9770fbc --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/caeb4629dcefc9f2280144288ce6b9687664394f...a3d7a1bb932a752257f7eb59eb2df5a8c9770fbc You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mail
[HippoCMS-scm] [Git][cms-community/hippo-essentials][bugfix/ESSENTIALS-1125] ESSENTIALS-1125 Fewer blank lines for consistent spacing.
Tobias Jeger pushed to branch bugfix/ESSENTIALS-1125 at cms-community / hippo-essentials Commits: c903a1e3 by Tobias Jeger at 2017-11-27T15:25:57+01:00 ESSENTIALS-1125 Fewer blank lines for consistent spacing. - - - - - 2 changed files: - LICENSE - plugins/commerce-search-box/src/main/appended-resources/META-INF/LICENSE Changes: = LICENSE = --- a/LICENSE +++ b/LICENSE @@ -291,8 +291,6 @@ plugins/skeleton-package/src/main/resources/instructions/js/jquery-2.1.0.min.js plugins/commerce-search-box/src/main/resources/js/jquery.typeahead.min.js plugins/commerce-search-box/src/main/resources/css/jquery.typeahead.min.css - - The MIT License (MIT) Copyright (c) 2015 tombertrand = plugins/commerce-search-box/src/main/appended-resources/META-INF/LICENSE = --- a/plugins/commerce-search-box/src/main/appended-resources/META-INF/LICENSE +++ b/plugins/commerce-search-box/src/main/appended-resources/META-INF/LICENSE @@ -8,7 +8,6 @@ is subject to the terms and conditions of the following licenses: css/jquery.typeahead.min.css js/jquery.typeahead.min.js - The MIT License (MIT) Copyright (c) 2015 tombertrand View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/c903a1e362fc89bc03d7aa0417a495edb3eead8d --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/c903a1e362fc89bc03d7aa0417a495edb3eead8d 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-essentials][master] ESSENTIALS-1117 Rework after review
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 3574c8f4 by Tobias Jeger at 2017-11-27T13:30:32+01:00 ESSENTIALS-1117 Rework after review - move resources to more appropriate location - remove unnecessary attributes from installation plugin - remove unnecessary attributes from plugin descriptor - remove unnecessary dependency from plugin pom - add plugins to dashboard dependencies - - - - - 7 changed files: - dashboard-dependencies/pom.xml - plugins/commerce-search-box/pom.xml - plugins/commerce-search-box/src/main/resources/META-INF/commerce-search-box_instructions.xml - plugins/commerce-search-box/src/main/resources/META-INF/resources/feature/commerce-search-box/commerce-search-box.html - plugins/commerce-search-box/src/main/resources/xml/commerce-search-box.xml → plugins/commerce-search-box/src/main/resources/hst/commerce-search-box.xml - plugins/commerce-search-box/src/main/resources/plugin-descriptor.json - plugins/commerce-search-box/src/main/resources/hst/commerce-components.xml → plugins/commerce-search-box/src/main/resources/xml/commerce-components.xml Changes: = dashboard-dependencies/pom.xml = --- a/dashboard-dependencies/pom.xml +++ b/dashboard-dependencies/pom.xml @@ -221,6 +221,11 @@ org.onehippo.cms7 + hippo-essentials-plugin-commerce-search-box + ${project.version} + + + org.onehippo.cms7 hippo-essentials-plugin-projects ${project.version} = plugins/commerce-search-box/pom.xml = --- a/plugins/commerce-search-box/pom.xml +++ b/plugins/commerce-search-box/pom.xml @@ -25,7 +25,6 @@ Hippo Essentials Commerce Search Box Plugin - Hippo Essentials Commerce Search Box Plugin hippo-essentials-plugin-commerce-search-box @@ -34,10 +33,5 @@ hippo-essentials-plugin-sdk-api provided - - org.onehippo.cms7 - hippo-essentials-plugin-sdk-implementation - provided - = plugins/commerce-search-box/src/main/resources/META-INF/commerce-search-box_instructions.xml = --- a/plugins/commerce-search-box/src/main/resources/META-INF/commerce-search-box_instructions.xml +++ b/plugins/commerce-search-box/src/main/resources/META-INF/commerce-search-box_instructions.xml @@ -16,15 +16,15 @@ --> http://www.onehippo.org/essentials/instructions;> - + - + - + = plugins/commerce-search-box/src/main/resources/META-INF/resources/feature/commerce-search-box/commerce-search-box.html = --- a/plugins/commerce-search-box/src/main/resources/META-INF/resources/feature/commerce-search-box/commerce-search-box.html +++ b/plugins/commerce-search-box/src/main/resources/META-INF/resources/feature/commerce-search-box/commerce-search-box.html @@ -17,7 +17,5 @@ + plugin-id="commerce-search-box"> = plugins/commerce-search-box/src/main/resources/xml/commerce-search-box.xml → plugins/commerce-search-box/src/main/resources/hst/commerce-search-box.xml = = plugins/commerce-search-box/src/main/resources/plugin-descriptor.json = --- a/plugins/commerce-search-box/src/main/resources/plugin-descriptor.json +++ b/plugins/commerce-search-box/src/main/resources/plugin-descriptor.json @@ -8,7 +8,6 @@ "introduction": "Commerce Search Box with auto suggestions", "description": "Please note that this component is a BloomReach Experience only component, it does not work in the community edition of Hippo CMS. Adding this component to the community version might result in unexpected and unsupported behaviour of the project. Also, you need a BloomReach Personalization license in order to use this component.", "id": "commerce-search-box", - "hasConfiguration": false, "packageFile" : "/META-INF/commerce-search-box_instructions.xml", "type": "feature", "icon" : "/essentials/images/commerce-search-box.png", = plugins/commerce-search-box/src/main/resources/hst/commerce-components.xml → plugins/commerce-search-box/src/main/resources/xml/commerce-components.xml = View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/3574c8f427300ed08166caeb9a41c980c224f035 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/3574c8f427300ed08166caeb9a41c980c224f035 You're rece
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] ESSENTIALS-1118 Rework after review
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 4b78b6e8 by Tobias Jeger at 2017-11-27T12:44:32+01:00 ESSENTIALS-1118 Rework after review - move resources to more appropriate location - remove unnecessary attributes from installation plugin - remove unnecessary attributes from plugin descriptor - remove unnecessary dependency from plugin pom - add plugins to dashboard dependencies - - - - - 13 changed files: - dashboard-dependencies/pom.xml - plugins/commerce-search-results-category/pom.xml - plugins/commerce-search-results-category/src/main/resources/META-INF/commerce-search-results-category_instructions.xml - plugins/commerce-search-results-category/src/main/resources/META-INF/resources/feature/commerce-search-results-category/commerce-search-results-category.html - plugins/commerce-search-results-category/src/main/resources/xml/commerce-search-category-list.xml → plugins/commerce-search-results-category/src/main/resources/hst/commerce-search-category-list.xml - plugins/commerce-search-results-category/src/main/resources/plugin-descriptor.json - plugins/commerce-search-results-category/src/main/resources/hst/commerce-components.xml → plugins/commerce-search-results-category/src/main/resources/xml/commerce-components.xml - plugins/commerce-search-results-products/pom.xml - plugins/commerce-search-results-products/src/main/resources/META-INF/commerce-search-results-products_instructions.xml - plugins/commerce-search-results-products/src/main/resources/META-INF/resources/feature/commerce-search-results-products/commerce-search-results-products.html - plugins/commerce-search-results-products/src/main/resources/xml/commerce-search-product-list.xml → plugins/commerce-search-results-products/src/main/resources/hst/commerce-search-product-list.xml - plugins/commerce-search-results-products/src/main/resources/plugin-descriptor.json - plugins/commerce-search-results-products/src/main/resources/hst/commerce-components.xml → plugins/commerce-search-results-products/src/main/resources/xml/commerce-components.xml Changes: = dashboard-dependencies/pom.xml = --- a/dashboard-dependencies/pom.xml +++ b/dashboard-dependencies/pom.xml @@ -211,6 +211,16 @@ org.onehippo.cms7 + hippo-essentials-plugin-commerce-search-results-category + ${project.version} + + + org.onehippo.cms7 + hippo-essentials-plugin-commerce-search-results-products + ${project.version} + + + org.onehippo.cms7 hippo-essentials-plugin-projects ${project.version} = plugins/commerce-search-results-category/pom.xml = --- a/plugins/commerce-search-results-category/pom.xml +++ b/plugins/commerce-search-results-category/pom.xml @@ -24,9 +24,7 @@ 4.1.0-SNAPSHOT - - Hippo Essentials commerce-search-results-category - Hippo Essentials commerce-search-results-category Plugin + Hippo Essentials Commerce Search Results Category hippo-essentials-plugin-commerce-search-results-category @@ -35,10 +33,5 @@ hippo-essentials-plugin-sdk-api provided - - org.onehippo.cms7 - hippo-essentials-plugin-sdk-implementation - provided - = plugins/commerce-search-results-category/src/main/resources/META-INF/commerce-search-results-category_instructions.xml = --- a/plugins/commerce-search-results-category/src/main/resources/META-INF/commerce-search-results-category_instructions.xml +++ b/plugins/commerce-search-results-category/src/main/resources/META-INF/commerce-search-results-category_instructions.xml @@ -17,9 +17,9 @@ http://www.onehippo.org/essentials/instructions;> - + - + = plugins/commerce-search-results-category/src/main/resources/META-INF/resources/feature/commerce-search-results-category/commerce-search-results-category.html = --- a/plugins/commerce-search-results-category/src/main/resources/META-INF/resources/feature/commerce-search-results-category/commerce-search-results-category.html +++ b/plugins/commerce-search-results-category/src/main/resources/META-INF/resources/feature/commerce-search-results-category/commerce-search-results-category.html @@ -17,7 +17,5 @@ + plugin-id="commerce-search-results-category"> = plugins/commerce-search-results-category/src/main/resources/xml/commerce-search-category-list.xml → plugins/commerce-search-results-category/src/main/resources/hst/commerce-search-category-list.xml = = plugins/commerce-search-results-category/src/main/resources/plugin
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] ESSENTIALS-1115 Fix dependency type for hippo-enterprise-package-app-dependencies
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: dfae22e7 by Tobias Jeger at 2017-11-27T11:49:25+01:00 ESSENTIALS-1115 Fix dependency type for hippo-enterprise-package-app-dependencies - - - - - 1 changed file: - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/DependencyUtils.java Changes: = plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/DependencyUtils.java = --- a/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/DependencyUtils.java +++ b/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/DependencyUtils.java @@ -248,6 +248,7 @@ public final class DependencyUtils { final Dependency enterpriseApp = new Dependency(); enterpriseApp.setArtifactId("hippo-enterprise-package-app-dependencies"); enterpriseApp.setGroupId(ENT_GROUP_ID); +enterpriseApp.setType("pom"); cmsModel.addDependency(enterpriseApp); MavenModelUtils.writePom(cmsModel, ProjectUtils.getPomFile(context, TargetPom.CMS)); View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/dfae22e7f6d418995f5fe7bfa15ac98bb0e355c9 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/dfae22e7f6d418995f5fe7bfa15ac98bb0e355c9 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-essentials] Deleted branch feature/ESSENTIALS-1115
Tobias Jeger deleted branch feature/ESSENTIALS-1115 at cms-community / hippo-essentials --- 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-essentials][feature/ESSENTIALS-1119] ESSENTIALS-1119 Refactor SEO plugin to use mavenDependency instruction
Tobias Jeger pushed to branch feature/ESSENTIALS-1119 at cms-community / hippo-essentials Commits: da6b0bed by Tobias Jeger at 2017-11-23T12:36:32+01:00 ESSENTIALS-1119 Refactor SEO plugin to use mavenDependency instruction Doing so removes the need to rebuild twice when installing this feature. - - - - - 2 changed files: - plugins/seo/src/main/resources/META-INF/seoPlugin_instructions.xml - plugins/seo/src/main/resources/plugin-descriptor.json Changes: = plugins/seo/src/main/resources/META-INF/seoPlugin_instructions.xml = --- a/plugins/seo/src/main/resources/META-INF/seoPlugin_instructions.xml +++ b/plugins/seo/src/main/resources/META-INF/seoPlugin_instructions.xml @@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-1119
Tobias Jeger pushed new branch feature/ESSENTIALS-1119 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1119 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-essentials] Deleted branch feature/ESSENTIALS-1112-rebased
Tobias Jeger deleted branch feature/ESSENTIALS-1112-rebased at cms-community / hippo-essentials --- 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-essentials][master] 6 commits: ESSENTIALS-1112 Initial framework for the Relevance plugin. The Elasticsearch…
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 6c4d5886 by Arent-Jan Banck at 2017-11-22T15:20:19+01:00 ESSENTIALS-1112 Initial framework for the Relevance plugin. The Elasticsearch plugin for using Elasticsearch in development is not yet added - - - - - d2dcf056 by Arent-Jan Banck at 2017-11-22T15:20:19+01:00 ESSENTIALS-1112 Add the Relevance collectors bundle as a Essentials feature - - - - - c01e9694 by Arent-Jan Banck at 2017-11-22T15:20:19+01:00 ESSENTIALS-1112 Revert unintended package rename - - - - - a24d1d58 by Arent-Jan Banck at 2017-11-22T15:26:34+01:00 ESSENTIALS-1112 Refactor the writePom and readPom to use the Maven commons archetype library. This to keep the xml formatting when saving pom files. Added support for merging pom files, used to do advanced configuration without a lot of SDK manipulation code.Using File objects instead of path strings for for more consistent file handling. Added support for Environment elements in the Tomcat context.xml and update the relevance plugin to use the new functionality. - - - - - b1ced8d1 by Tobias Jeger at 2017-11-22T21:46:49+01:00 ESSENTIALS-1112 Rework after review - revert inadvertent changes - remove unnecessary dependency on implementation in relevance collectors bundle plugin - fix code layout - fix MavenCargoUtilsTest to use ResourceModifyingTest - improve plugin descriptor descriptions - improve how the local elasticsearch plugin versions are managed - improve Dom4jUtils indentation logic - set logging level of implementation unit tests from DEBUG to INFO - - - - - 5b699301 by Tobias Jeger at 2017-11-22T21:50:52+01:00 ESSENTIALS-1112 Reintegrate feature/ESSENTIALS-1112-rebased - - - - - 30 changed files: - dashboard-dependencies/pom.xml - plugin-sdk/implementation/pom.xml - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/ContextXMLUtils.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/DependencyUtils.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/Dom4JUtils.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/MavenCargoUtils.java - + plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/MavenModelUtils.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/ProjectUtils.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/ResourceModifyingTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/utils/ContextXMLUtilsTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/utils/MavenCargoUtilsTest.java - plugin-sdk/implementation/src/test/resources/log4j2.xml - + plugin-sdk/implementation/src/test/resources/test-pom-overlay.xml - + plugin-sdk/implementation/src/test/resources/utils/cargo/no-cargo-plugin.xml - + plugin-sdk/implementation/src/test/resources/utils/cargo/no-cargo-profile.xml - plugin-sdk/pom.xml - plugins/pom.xml - plugins/projects/src/main/java/org/onehippo/cms7/essentials/plugins/projects/ProjectsInstruction.java - plugins/projects/src/main/resources/META-INF/resources/feature/projectsPlugin/projectsPlugin.html → plugins/projects/src/main/resources/META-INF/resources/feature/relevancePlugin/projectsPlugin.html - + plugins/relevance-collectors-bundle/pom.xml - + plugins/relevance-collectors-bundle/src/main/java/org/onehippo/cms7/essentials/plugins/relevanceonnectorsbundle/RelevanceCollectorsBundleParameterService.java - + plugins/relevance-collectors-bundle/src/main/resources/META-INF/resources/feature/images/relevance-collectors-bundle-plugin-icon.png - + plugins/relevance-collectors-bundle/src/main/resources/META-INF/resources/feature/relevanceCollectorsBundlePlugin/relevanceCollectorsBundlePlugin.html - + plugins/relevance-collectors-bundle/src/main/resources/META-INF/web-fragment.xml - + plugins/relevance-collectors-bundle/src/main/resources/plugin-descriptor.json - + plugins/relevance/pom.xml - + plugins/relevance/src/main/java/org/onehippo/cms7/essentials/plugins/relevance/RelevanceInstruction.java - + plugins/relevance/src/main/resources/META-INF/relevance_plugin_instructions.xml - + plugins/relevance/src/main/resources/META-INF/resources/feature/images/relevance-plugin-icon.png - + plugins/relevance/src/main/resources/META-INF/resources/feature/images/screenshots/audiences-characteristics.png The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/e2a13ebec6ff0a4231d5500fca45242b0a99fc51...5b699301bfc1a9222f1ea43afaaa6c1c45f2fe55 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/e2a13ebec6ff0a4231d5500fca45242b0a99fc51...5b699301bfc1a9222f1ea43afaaa6c1c45f2fe55 You're receiving this email because of your
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch feature/ESSENTIALS-1112
Tobias Jeger deleted branch feature/ESSENTIALS-1112 at cms-community / hippo-essentials --- 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-essentials] Pushed new branch feature/ESSENTIALS-1112-rebased
Tobias Jeger pushed new branch feature/ESSENTIALS-1112-rebased at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1112-rebased 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-essentials][feature/ESSENTIALS-1114] ESSENTIALS-1114 Minor improvement after review
Tobias Jeger pushed to branch feature/ESSENTIALS-1114 at cms-community / hippo-essentials Commits: 3255f0e0 by Tobias Jeger at 2017-11-22T15:05:17+01:00 ESSENTIALS-1114 Minor improvement after review - - - - - 1 changed file: - plugin-sdk/api/src/main/resources/instructions.xsd Changes: = plugin-sdk/api/src/main/resources/instructions.xsd = --- a/plugin-sdk/api/src/main/resources/instructions.xsd +++ b/plugin-sdk/api/src/main/resources/instructions.xsd @@ -177,7 +177,7 @@ -Pattern for classpath scanning of annotated HST bean classes, e.g. 'org/example/**/*.class'. +Pattern for classpath scanning of annotated HST bean classes, e.g. 'classpath*:org/example/**/*.class'. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/3255f0e081481a6c968cd2ca3dc9b705a1267d38 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/3255f0e081481a6c968cd2ca3dc9b705a1267d38 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-essentials] Pushed new branch feature/ESSENTIALS-1114
Tobias Jeger pushed new branch feature/ESSENTIALS-1114 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1114 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-essentials] Deleted branch feature/ESSENTIALS-1113
Tobias Jeger deleted branch feature/ESSENTIALS-1113 at cms-community / hippo-essentials --- 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-essentials][master] 16 commits: ESSENTIALS-1113 Remove ValidationEvent support
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 37ed0c4b by Tobias Jeger at 2017-11-20T11:49:57+01:00 ESSENTIALS-1113 Remove ValidationEvent support The entire code base does not instantiate validation events, and the corresponding listener exposes an API which is unused. There is no documentation providing any clue about the intent behind this. Im considering it severely dead code and removing it. - - - - - 412dc703 by Tobias Jeger at 2017-11-20T11:49:57+01:00 ESSENTIALS-1113 Remove LogEvent support The Essentials code base does not instantiate log events which, when thrown at the eventBus, would trigger an INFO log message from the LoggingPluginEventListener logger. No documentation about the intent behind this unused piece of functionality was found. Im removing it as dead code. - - - - - 526fd91a by Tobias Jeger at 2017-11-20T11:49:57+01:00 ESSENTIALS-1113 Remove unused undo and display location concepts The Essentials APIs PluginEvent used to expose a concept of undo and display location. Both concepts have never been in use in the productized version of Essentials. The concept of undoing plugin installation has been discussed in the past, but was agreed to be too difficult to implement. The concept of a display location seems to refer to initial UI design ideas, which have never been implemented. Since both concepts are not in use, they constitute dead code, which is why Im removing it. - - - - - 1a0b352e by Tobias Jeger at 2017-11-20T11:49:57+01:00 ESSENTIALS-1113 Remove support for InstructionEvent InstructionEvent was used by various types of PluginInstruction to send messages over the eventBus to the InstructionsEventListener, which would log the messages at INFO level and count them. The counting aspect has only been in use by unit tests, and the logging aspect feels like overly complicated informal logging. I replaced the InstructionEvents with in-place log.info messages, providing roughly the same amount and depth of logging information, but removed the superfluous, undocumented complexity associated with InstructionEvents. - - - - - 69a61388 by Tobias Jeger at 2017-11-20T11:49:57+01:00 ESSENTIALS-1113 Remove support for DisplayEvent DisplayEvent seems an outdated / incomplete approach to send messages including HTML formatting information to the front-end. the events are posted on the eventBus, and MemoryPluginEventListener would collect them in a list, which was only ever accessed by unit test code. DisplayEvents DisplayType enum was also referenced (and stored) in MessageRestful classes, and as such, they could have been serialized and sent to the front-end, but the front-end code makes no use of that additional information. In the absence of any kind of documentation of the intent of this mechanism, I can only conclude that this is an outdated, dead mechanism, which is why Im cleaning it up. The clean-up work on PluginEvents so far has triggered a move of some message templates from a properties file (from which they were assigned to String instance variables through Spring) into the log messages directly, and so Ive also removed the obsolete Spring configuration. - - - - - 408923a4 by Tobias Jeger at 2017-11-20T11:49:57+01:00 ESSENTIALS-1113 Remove support for MessageEvent MessageEvents (rather than its subclass RebuildEvent) have been posted to the event bus, but there was no listener to ever deal with them, nor was there a listener for MessageEvents super classes BaseEvent or PluginEvent. As such, all instantiations of MessageEvent (other than RebuildEvent) were void. I removed them, and cleaned up injection (Spring or manual) of the event bus where no longer used. I consolidated the (minimal) logic from BaseEvent and MessageEvent in RebuildEvent, which now directly implements PluginEvent. - - - - - 462865da by Tobias Jeger at 2017-11-20T11:49:57+01:00 ESSENTIALS-1113 Remove getter/setter for action from Instruction Only a small subset of all existing instructions actually have an action attribute (xml, file/freemarker, directory). Exposing a action attribute through the API Instruction causes a lot of void boilerplate code. Also, the set of supported actions differs per instruction type. I therefore removed the action attribute from the Instruction API, and added per-instruction type action enums, which match with the instructions XSD. - - - - - df88a2a7 by Tobias Jeger at 2017-11-20T11:51:01+01:00 ESSENTIALS-1113 Rework instruction message handling Each instruction shall expose a list of change messages to be displayed to the user before installing a plugin. The Instruction API has been adjusted to reflect this, and all implementations have been adjusted to provide a meaningful default change message. This change made it possible to move some quirky implementation-dependent logic from the MessageInstructionExecutor into the Instruction implementation. Also, the Instruction API process has been renamed to execute for more
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1113] ESSENTIALS-1113 Minor improvements after review
Tobias Jeger pushed to branch feature/ESSENTIALS-1113 at cms-community / hippo-essentials Commits: 197fc4c5 by Tobias Jeger at 2017-11-22T14:21:28+01:00 ESSENTIALS-1113 Minor improvements after review - - - - - 2 changed files: - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/ctx/PluginContextFactoryImpl.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/BuiltinInstruction.java Changes: = plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/ctx/PluginContextFactoryImpl.java = --- a/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/ctx/PluginContextFactoryImpl.java +++ b/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/ctx/PluginContextFactoryImpl.java @@ -16,12 +16,9 @@ package org.onehippo.cms7.essentials.dashboard.ctx; -import javax.inject.Singleton; - import org.springframework.stereotype.Component; @Component -@Singleton public class PluginContextFactoryImpl implements PluginContextFactory { public PluginContext getContext() { return new DefaultPluginContext(); = plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/BuiltinInstruction.java = --- a/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/BuiltinInstruction.java +++ b/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/instruction/BuiltinInstruction.java @@ -19,7 +19,6 @@ package org.onehippo.cms7.essentials.dashboard.instruction; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlTransient; -import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import org.onehippo.cms7.essentials.dashboard.instructions.Instruction; @@ -57,12 +56,9 @@ public abstract class BuiltinInstruction implements Instruction { @Override public Multimap<MessageGroup, String> getChangeMessages() { - String message = getMessage(); if (message != null) { -final Multimap<MessageGroup, String> result = ArrayListMultimap.create(); -result.put(defaultGroup, message); -return result; +return Instruction.makeChangeMessages(defaultGroup, message); } return getDefaultChangeMessages(); View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/197fc4c58250ddf3f7fe42c492d3a5a384ac221c --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/197fc4c58250ddf3f7fe42c492d3a5a384ac221c 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-essentials][feature/ESSENTIALS-1113] ESSENTIALS-1113 Move PluginContextFactoryImpl back to SDK
Tobias Jeger pushed to branch feature/ESSENTIALS-1113 at cms-community / hippo-essentials Commits: a5767bf9 by Tobias Jeger at 2017-11-21T09:47:17+01:00 ESSENTIALS-1113 Move PluginContextFactoryImpl back to SDK I realized that my goal should not be to get rid of the plugin-sdk/implementation, but to get rid of the need for Essentials plugins to depend on it, rather than on the plugin-sdk/api only. API and implementation should have the same lifecycle, which should be distict from the lifecycle of the dashboard, such that we can eventually move the plugins to their appropriate location (outside of the Essentials project). - - - - - 1 changed file: - dashboard/src/main/java/org/onehippo/cms7/essentials/dashboard/ctx/PluginContextFactoryImpl.java → plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/ctx/PluginContextFactoryImpl.java Changes: = dashboard/src/main/java/org/onehippo/cms7/essentials/dashboard/ctx/PluginContextFactoryImpl.java → plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/ctx/PluginContextFactoryImpl.java = View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/a5767bf92e6b4aaa915bba1d698a6d54a4c773dc --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/a5767bf92e6b4aaa915bba1d698a6d54a4c773dc 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-essentials] Pushed new branch feature/ESSENTIALS-1115
Tobias Jeger pushed new branch feature/ESSENTIALS-1115 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1115 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-essentials][feature/ESSENTIALS-1113] ESSENTIALS-1113 Remove obsolete jaxb annotation from Instruction API
Tobias Jeger pushed to branch feature/ESSENTIALS-1113 at cms-community / hippo-essentials Commits: 3e81c948 by Tobias Jeger at 2017-11-20T12:23:28+01:00 ESSENTIALS-1113 Remove obsolete jaxb annotation from Instruction API - - - - - 1 changed file: - plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/instructions/Instruction.java Changes: = plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/instructions/Instruction.java = --- a/plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/instructions/Instruction.java +++ b/plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/instructions/Instruction.java @@ -16,8 +16,6 @@ package org.onehippo.cms7.essentials.dashboard.instructions; -import javax.xml.bind.annotation.XmlTransient; - import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; @@ -29,7 +27,6 @@ import org.onehippo.cms7.essentials.dashboard.packaging.MessageGroup; * * All instructions should describe their (intended) action by means of one or more "change messages". */ -@XmlTransient public interface Instruction { /** View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/3e81c948f82b1b264438ad312ca20453b9acea93 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/3e81c948f82b1b264438ad312ca20453b9acea93 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-essentials] Deleted branch feature/ESSENTIALS-1111
Tobias Jeger deleted branch feature/ESSENTIALS- at cms-community / hippo-essentials --- 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-essentials] Pushed new branch feature/ESSENTIALS-1113
Tobias Jeger pushed new branch feature/ESSENTIALS-1113 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1113 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-essentials][feature/ESSENTIALS-1111] ESSENTIALS-1111 Improve change message of Lucene Index Exporter plugin
Tobias Jeger pushed to branch feature/ESSENTIALS- at cms-community / hippo-essentials Commits: e522a8ab by Tobias Jeger at 2017-11-20T11:45:44+01:00 ESSENTIALS- Improve change message of Lucene Index Exporter plugin - - - - - 1 changed file: - plugins/lucene-index-exporter/src/main/java/com/onehippo/cms7/essentials/plugins/indexexporter/LuceneIndexExporterInstruction.java Changes: = plugins/lucene-index-exporter/src/main/java/com/onehippo/cms7/essentials/plugins/indexexporter/LuceneIndexExporterInstruction.java = --- a/plugins/lucene-index-exporter/src/main/java/com/onehippo/cms7/essentials/plugins/indexexporter/LuceneIndexExporterInstruction.java +++ b/plugins/lucene-index-exporter/src/main/java/com/onehippo/cms7/essentials/plugins/indexexporter/LuceneIndexExporterInstruction.java @@ -32,7 +32,7 @@ public class LuceneIndexExporterInstruction implements Instruction { @Override public String getMessage() { -return "Ensure availability of RepositoryJaxrsServlet through cms web.xml"; +return "Add dependency and Ensure availability of RepositoryJaxrsServlet through cms web.xml"; } @Override View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/e522a8ab232e305d857b26414bfc475a7bc35cac --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/e522a8ab232e305d857b26414bfc475a7bc35cac 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-essentials] Pushed new branch feature/ESSENTIALS-1111
Tobias Jeger pushed new branch feature/ESSENTIALS- at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS- 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-essentials] Deleted branch bugfix/ESSENTIALS-1048
Tobias Jeger deleted branch bugfix/ESSENTIALS-1048 at cms-community / hippo-essentials --- 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-essentials] Pushed new branch feature/ESSENTIALS-1095
Tobias Jeger pushed new branch feature/ESSENTIALS-1095 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1095 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-essentials] Deleted branch feature/ESSENTIALS-1076
Tobias Jeger deleted branch feature/ESSENTIALS-1076 at cms-community / hippo-essentials --- 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-essentials] Deleted branch feature/ESSENTIALS-1063
Tobias Jeger deleted branch feature/ESSENTIALS-1063 at cms-community / hippo-essentials --- 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-essentials] Deleted branch feature/ESSENTIALS-1065
Tobias Jeger deleted branch feature/ESSENTIALS-1065 at cms-community / hippo-essentials --- 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-essentials] Deleted branch feature/ESSENTIALS-1062
Tobias Jeger deleted branch feature/ESSENTIALS-1062 at cms-community / hippo-essentials --- 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-essentials] Deleted branch feature/ESSENTIALS-1045
Tobias Jeger deleted branch feature/ESSENTIALS-1045 at cms-community / hippo-essentials --- 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-essentials] Deleted branch bugfix/ESSENTIALS-1081
Tobias Jeger deleted branch bugfix/ESSENTIALS-1081 at cms-community / hippo-essentials --- 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-essentials] Deleted branch bugfix/ESSENTIALS-1078
Tobias Jeger deleted branch bugfix/ESSENTIALS-1078 at cms-community / hippo-essentials --- 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-essentials] Deleted branch bugfix/ESSENTIALS-1064
Tobias Jeger deleted branch bugfix/ESSENTIALS-1064 at cms-community / hippo-essentials --- 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-taxonomy][release/4.0] HIPPLUG-1507 Use latest (snapshot) release to pull in latest plugin version.
Tobias Jeger pushed to branch release/4.0 at cms-community / hippo-plugin-taxonomy Commits: b4775d9f by Tobias Jeger at 2017-10-31T09:53:18+01:00 HIPPLUG-1507 Use latest (snapshot) release to pull in latest plugin version. - - - - - 1 changed file: - demo/pom.xml Changes: = demo/pom.xml = --- a/demo/pom.xml +++ b/demo/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-cms7-release -12.0.2 +12.0.3-SNAPSHOT Hippo Plugin Taxonomy Demo View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/b4775d9f50603311f458777180053f70381c7b7f --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/b4775d9f50603311f458777180053f70381c7b7f 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-taxonomy][release/4.0] HIPPLUG-1507 Move content categorization from demo to plugin
Tobias Jeger pushed to branch release/4.0 at cms-community / hippo-plugin-taxonomy Commits: 0a6a8848 by Tobias Jeger at 2017-10-31T09:44:40+01:00 HIPPLUG-1507 Move content categorization from demo to plugin and fix auto-export setup in demo project (cherry picked from commit 2c7e90abd932e6ba7a38d34e620aeb08aa21afb5) (cherry picked from commit 6fb6346d2996a01329e896049a1dd882b7a2d44b) - - - - - 3 changed files: - addon/repository/src/main/resources/hcm-config/main.yaml - demo/plugin/src/main/resources/hcm-config/main.yaml - demo/repository-data/src/main/resources/hcm-config/main.yaml Changes: = addon/repository/src/main/resources/hcm-config/main.yaml = --- a/addon/repository/src/main/resources/hcm-config/main.yaml +++ b/addon/repository/src/main/resources/hcm-config/main.yaml @@ -3,3 +3,6 @@ definitions: hippotaxonomy: uri: http://www.hippoecm.org/hippotaxonomy/nt/1.2 cnd: hippotaxonomy.cnd + config: +/content/taxonomies: + .meta:category: content = demo/plugin/src/main/resources/hcm-config/main.yaml = --- a/demo/plugin/src/main/resources/hcm-config/main.yaml +++ b/demo/plugin/src/main/resources/hcm-config/main.yaml @@ -2,3 +2,8 @@ definitions: config: /hippo:namespaces/hippotaxonomy/taxonomy/editor:templates/_default_/root: plugin.class: org.onehippo.taxonomy.demo.plugin.AdditionalFieldCustomTaxonomyEditorPlugin +/hippo:configuration/hippo:modules/autoexport/hippo:moduleconfig: + autoexport:modules: +operation: add +type: string +value: ['plugin'] \ No newline at end of file = demo/repository-data/src/main/resources/hcm-config/main.yaml = --- a/demo/repository-data/src/main/resources/hcm-config/main.yaml +++ b/demo/repository-data/src/main/resources/hcm-config/main.yaml @@ -37,5 +37,3 @@ definitions: operation: add type: string value: [sitewriters] -/content/taxonomies: - .meta:category: content View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/0a6a88482c20ce6f2bd71bb2876d077745ffab6a --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/0a6a88482c20ce6f2bd71bb2876d077745ffab6a 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-release][release/12.0] CMS-16 Bump taxonomy plugin version
Tobias Jeger pushed to branch release/12.0 at cms-community / hippo-cms-release Commits: 28f6403a by Tobias Jeger at 2017-10-31T09:47:38+01:00 CMS-16 Bump taxonomy plugin version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 5.0.2 4.0.1 4.0.1 -4.0.2 + 4.0.3-SNAPSHOT 2.0.5 2.0.2 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/28f6403a71f5fe53a8e177282da04c82152dae94 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/28f6403a71f5fe53a8e177282da04c82152dae94 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-taxonomy][master] 2 commits: HIPPLUG-1502 Move content categorization from demo to plugin
Tobias Jeger pushed to branch master at cms-community / hippo-plugin-taxonomy Commits: 2c7e90ab by Tobias Jeger at 2017-10-30T14:45:43+01:00 HIPPLUG-1502 Move content categorization from demo to plugin - - - - - 6fb6346d by Tobias Jeger at 2017-10-30T14:55:30+01:00 HIPPLUG-1502 Fix auto-export setup in demo project - - - - - 3 changed files: - addon/repository/src/main/resources/hcm-config/main.yaml - demo/plugin/src/main/resources/hcm-config/main.yaml - demo/repository-data/src/main/resources/hcm-config/main.yaml Changes: = addon/repository/src/main/resources/hcm-config/main.yaml = --- a/addon/repository/src/main/resources/hcm-config/main.yaml +++ b/addon/repository/src/main/resources/hcm-config/main.yaml @@ -3,3 +3,6 @@ definitions: hippotaxonomy: uri: http://www.hippoecm.org/hippotaxonomy/nt/1.2 cnd: hippotaxonomy.cnd + config: +/content/taxonomies: + .meta:category: content = demo/plugin/src/main/resources/hcm-config/main.yaml = --- a/demo/plugin/src/main/resources/hcm-config/main.yaml +++ b/demo/plugin/src/main/resources/hcm-config/main.yaml @@ -2,3 +2,8 @@ definitions: config: /hippo:namespaces/hippotaxonomy/taxonomy/editor:templates/_default_/root: plugin.class: org.onehippo.taxonomy.demo.plugin.AdditionalFieldCustomTaxonomyEditorPlugin +/hippo:configuration/hippo:modules/autoexport/hippo:moduleconfig: + autoexport:modules: +operation: add +type: string +value: ['plugin'] \ No newline at end of file = demo/repository-data/src/main/resources/hcm-config/main.yaml = --- a/demo/repository-data/src/main/resources/hcm-config/main.yaml +++ b/demo/repository-data/src/main/resources/hcm-config/main.yaml @@ -37,5 +37,3 @@ definitions: operation: add type: string value: [sitewriters] -/content/taxonomies: - .meta:category: content View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/b1773ef1d784a42f14a9d07ab3300dba5e5f27f1...6fb6346d2996a01329e896049a1dd882b7a2d44b --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/b1773ef1d784a42f14a9d07ab3300dba5e5f27f1...6fb6346d2996a01329e896049a1dd882b7a2d44b 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] Pushed new branch feature/REPO-1867
Tobias Jeger pushed new branch feature/REPO-1867 at cms-community / hippo-repository --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/tree/feature/REPO-1867 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] Pushed new branch bufgix/CMS-10947
Tobias Jeger pushed new branch bufgix/CMS-10947 at cms-community / hippo-cms --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/tree/bufgix/CMS-10947 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][master] HSTTWO-4153 Update to GA version and fix bootstrap warnings and errors
Tobias Jeger pushed to branch master at cms-community / hippo-testsuite Commits: ff709fb1 by Tobias Jeger at 2017-10-12T12:08:42+02:00 HSTTWO-4153 Update to GA version and fix bootstrap warnings and errors (cherry picked from commit 06608e6fb18455d1df757cf324b1dc85fcb886bf) - - - - - 10 changed files: - content/src/main/resources/hcm-config/hippo-configuration/modules/autoexport-module.yaml - content/src/main/resources/hcm-config/hst-sites.yaml - content/src/main/resources/hcm-config/hst-virtualhosts.yaml - + intranet-bootstrap/configuration/src/main/resources/hcm-config/configuration/modules/autoexport.yaml - intranet-bootstrap/configuration/src/main/resources/hcm-config/main.yaml - intranet-bootstrap/content/src/main/resources/hcm-content/content/documents/intranet.yaml - intranet-bootstrap/webfiles/src/main/resources/hcm-config/main.yaml - intranet-bootstrap/webfiles/src/main/resources/hcm-module.yaml - prod-server-config/src/main/resources/hcm-config/hst-hst/hst-prod-hosts.yaml - + prod-server-config/src/main/resources/hcm-config/main.yaml Changes: = content/src/main/resources/hcm-config/hippo-configuration/modules/autoexport-module.yaml = --- a/content/src/main/resources/hcm-config/hippo-configuration/modules/autoexport-module.yaml +++ b/content/src/main/resources/hcm-config/hippo-configuration/modules/autoexport-module.yaml @@ -1,11 +1,4 @@ definitions: config: /hippo:configuration/hippo:modules/autoexport/hippo:moduleconfig: - autoexport:enabled: -operation: override -type: boolean -value: false - autoexport:modules: -operation: add -type: string -value: ['intranet-bootstrap/content:/content/documents/intranet', 'intranet-bootstrap/configuration:/hippo:namespaces/intranet'] + autoexport:enabled: false = content/src/main/resources/hcm-config/hst-sites.yaml = --- a/content/src/main/resources/hcm-config/hst-sites.yaml +++ b/content/src/main/resources/hcm-config/hst-sites.yaml @@ -1,7 +1,6 @@ definitions: config: /hst:hst/hst:sites: - jcr:primaryType: hst:sites /demosite: jcr:primaryType: hst:site hst:content: /content/documents/demosite = content/src/main/resources/hcm-config/hst-virtualhosts.yaml = --- a/content/src/main/resources/hcm-config/hst-virtualhosts.yaml +++ b/content/src/main/resources/hcm-config/hst-virtualhosts.yaml @@ -1,9 +1,7 @@ definitions: config: /hst:hst/hst:hosts: - jcr:primaryType: hst:virtualhosts hst:cmspreviewprefix: _testsuiteExamplePrefix - hst:defaultcontextpath: /site hst:defaulthostname: localhost hst:diagnosticsenabled: false hst:homepage: home = intranet-bootstrap/configuration/src/main/resources/hcm-config/configuration/modules/autoexport.yaml = --- /dev/null +++ b/intranet-bootstrap/configuration/src/main/resources/hcm-config/configuration/modules/autoexport.yaml @@ -0,0 +1,7 @@ +definitions: + config: +/hippo:configuration/hippo:modules/autoexport/hippo:moduleconfig: + autoexport:modules: +operation: add +type: string +value: ['intranet-bootstrap/content:/content/documents/intranet', 'intranet-bootstrap/configuration:/hippo:namespaces/intranet'] = intranet-bootstrap/configuration/src/main/resources/hcm-config/main.yaml = --- a/intranet-bootstrap/configuration/src/main/resources/hcm-config/main.yaml +++ b/intranet-bootstrap/configuration/src/main/resources/hcm-config/main.yaml @@ -14,3 +14,5 @@ definitions: operation: add type: string value: [intranetpreviewuser] +/hippo:configuration/hippo:modules/webfiles/hippo:moduleconfig: + watchedModules: [intranet-bootstrap/webfiles] = intranet-bootstrap/content/src/main/resources/hcm-content/content/documents/intranet.yaml = --- a/intranet-bootstrap/content/src/main/resources/hcm-content/content/documents/intranet.yaml +++ b/intranet-bootstrap/content/src/main/resources/hcm-content/content/documents/intranet.yaml @@ -1,7 +1,6 @@ /content/documents/intranet: jcr:primaryType: hippostd:folder jcr:mixinTypes: ['mix:referenceable', 'hippotranslation:translated'] - jcr:uuid: 996bcac5-86cf-49b5-a7a3-16a74863e814 hippostd:foldertype: [new-translated-folder-intranet, new-document-intranet] hippotranslation:id: 996bcac5-86cf-49b5-a7a3-16a74863e814 hippotranslation:locale: en = intranet-bootstrap/webfiles/src/main/resources/hcm-config/main.yaml = --- a/intranet-bootstrap
[HippoCMS-scm] [Git][cms-community/hippo-testsuite][release/4.0] HSTTWO-4153 Update to GA version and fix bootstrap warnings and errors
Tobias Jeger pushed to branch release/4.0 at cms-community / hippo-testsuite Commits: 06608e6f by Tobias Jeger at 2017-10-12T12:04:46+02:00 HSTTWO-4153 Update to GA version and fix bootstrap warnings and errors - - - - - 10 changed files: - content/src/main/resources/hcm-config/hippo-configuration/modules/autoexport-module.yaml - content/src/main/resources/hcm-config/hst-sites.yaml - content/src/main/resources/hcm-config/hst-virtualhosts.yaml - + intranet-bootstrap/configuration/src/main/resources/hcm-config/configuration/modules/autoexport.yaml - intranet-bootstrap/configuration/src/main/resources/hcm-config/main.yaml - intranet-bootstrap/content/src/main/resources/hcm-content/content/documents/intranet.yaml - intranet-bootstrap/webfiles/src/main/resources/hcm-config/main.yaml - intranet-bootstrap/webfiles/src/main/resources/hcm-module.yaml - pom.xml - + prod-server-config/src/main/resources/hcm-config/main.yaml Changes: = content/src/main/resources/hcm-config/hippo-configuration/modules/autoexport-module.yaml = --- a/content/src/main/resources/hcm-config/hippo-configuration/modules/autoexport-module.yaml +++ b/content/src/main/resources/hcm-config/hippo-configuration/modules/autoexport-module.yaml @@ -1,11 +1,4 @@ definitions: config: /hippo:configuration/hippo:modules/autoexport/hippo:moduleconfig: - autoexport:enabled: -operation: override -type: boolean -value: false - autoexport:modules: -operation: add -type: string -value: ['intranet-bootstrap/content:/content/documents/intranet', 'intranet-bootstrap/configuration:/hippo:namespaces/intranet'] + autoexport:enabled: false = content/src/main/resources/hcm-config/hst-sites.yaml = --- a/content/src/main/resources/hcm-config/hst-sites.yaml +++ b/content/src/main/resources/hcm-config/hst-sites.yaml @@ -1,7 +1,6 @@ definitions: config: /hst:hst/hst:sites: - jcr:primaryType: hst:sites /demosite: jcr:primaryType: hst:site hst:content: /content/documents/demosite = content/src/main/resources/hcm-config/hst-virtualhosts.yaml = --- a/content/src/main/resources/hcm-config/hst-virtualhosts.yaml +++ b/content/src/main/resources/hcm-config/hst-virtualhosts.yaml @@ -1,9 +1,7 @@ definitions: config: /hst:hst/hst:hosts: - jcr:primaryType: hst:virtualhosts hst:cmspreviewprefix: _testsuiteExamplePrefix - hst:defaultcontextpath: /site hst:defaulthostname: localhost hst:diagnosticsenabled: false hst:homepage: home = intranet-bootstrap/configuration/src/main/resources/hcm-config/configuration/modules/autoexport.yaml = --- /dev/null +++ b/intranet-bootstrap/configuration/src/main/resources/hcm-config/configuration/modules/autoexport.yaml @@ -0,0 +1,7 @@ +definitions: + config: +/hippo:configuration/hippo:modules/autoexport/hippo:moduleconfig: + autoexport:modules: +operation: add +type: string +value: ['intranet-bootstrap/content:/content/documents/intranet', 'intranet-bootstrap/configuration:/hippo:namespaces/intranet'] = intranet-bootstrap/configuration/src/main/resources/hcm-config/main.yaml = --- a/intranet-bootstrap/configuration/src/main/resources/hcm-config/main.yaml +++ b/intranet-bootstrap/configuration/src/main/resources/hcm-config/main.yaml @@ -14,3 +14,5 @@ definitions: operation: add type: string value: [intranetpreviewuser] +/hippo:configuration/hippo:modules/webfiles/hippo:moduleconfig: + watchedModules: [intranet-bootstrap/webfiles] = intranet-bootstrap/content/src/main/resources/hcm-content/content/documents/intranet.yaml = --- a/intranet-bootstrap/content/src/main/resources/hcm-content/content/documents/intranet.yaml +++ b/intranet-bootstrap/content/src/main/resources/hcm-content/content/documents/intranet.yaml @@ -1,7 +1,6 @@ /content/documents/intranet: jcr:primaryType: hippostd:folder jcr:mixinTypes: ['mix:referenceable', 'hippotranslation:translated'] - jcr:uuid: 996bcac5-86cf-49b5-a7a3-16a74863e814 hippostd:foldertype: [new-translated-folder-intranet, new-document-intranet] hippotranslation:id: 996bcac5-86cf-49b5-a7a3-16a74863e814 hippotranslation:locale: en = intranet-bootstrap/webfiles/src/main/resources/hcm-config/main.yaml = --- a/intranet-bootstrap/webfiles/src/main/resources/hcm-config/main.yaml +++ b/intranet-bootstrap/webfiles/src/main/resources/hcm-config/main.yaml @@ -1,5