Jeroen Hoffman pushed to branch feature/HIPPLUG-1481 at cms-community / hippo-plugin-poll
Commits: 26704d11 by Jeroen Hoffman at 2017-11-13T15:16:38+01:00 HIPPLUG-1481 merge 3 <instructionSet> elements into 1 because having optional parts is not applicable here - - - - - 4 changed files: - demo/README.txt - essentials-demo-feature/README.txt - essentials-demo-feature/src/main/resources/META-INF/instructions.xml - essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html Changes: ===================================== demo/README.txt ===================================== --- a/demo/README.txt +++ b/demo/README.txt @@ -17,7 +17,7 @@ How to generate a demo project for the Polls feature - With Essentials, set up the project with the default settings. Note that JSP for templating language is not supported for the Polls Demo feature. -- With Essentials, install Polls feature, then rebuild && run twice ((boarding, installing). +- With Essentials, install Polls feature, then rebuild && run twice (boarding, installing). - With Essentials, install Polls Demo feature, then rebuild && run. ===================================== essentials-demo-feature/README.txt ===================================== --- a/essentials-demo-feature/README.txt +++ b/essentials-demo-feature/README.txt @@ -1,6 +1,6 @@ -Hippo Essentials Plugin Feature -=============================== -This module contains a Hippo Essentials Plugin Feature. It adds a custom poll document: a document in the project +Hippo Essentials Demo Feature +============================= +This module contains a Hippo Essentials Demo Feature. It adds a custom poll document: a document in the project namespace with a title and the poll compound. It also adds a rendering template and some HST configuration for it. To use this feature, add a dependency to this artifact to the Essentials module of a Hippo project. After a (re)build it ===================================== essentials-demo-feature/src/main/resources/META-INF/instructions.xml ===================================== --- a/essentials-demo-feature/src/main/resources/META-INF/instructions.xml +++ b/essentials-demo-feature/src/main/resources/META-INF/instructions.xml @@ -3,38 +3,31 @@ <instructions xmlns="http://www.onehippo.org/essentials/instructions";> <instructionSet> - <!-- load cnd --> + <!-- load cnd and custom namespace XML --> <cnd documentType="customPollDocument" superType="{{namespace}}:basedocument,hippostd:relaxed,hippotranslation:translated"/> - <!-- java classes --> + <xml action="copy" source="xml/namespace-customPollDocument.xml" target="/hippo:namespaces/{{namespace}}"/> + + <!-- Java classes --> <file action="copy" source="java/CustomPollDocument.txt" target="{{beansFolder}}/CustomPollDocument.java"/> <file action="copy" source="java/CustomPollDocumentComponent.txt" target="{{componentsFolder}}/CustomPollDocumentComponent.java"/> <file action="copy" source="java/CustomPollDocumentComponentInfo.txt" target="{{componentsFolder}}/CustomPollDocumentComponentInfo.java"/> - </instructionSet> - <!-- group "freemarker" is used when that option is chosen in the general settings --> - <instructionSet group="freemarker"> <!-- custompoll.component.ftl created from contents of the standard template at /hst:hst/hst:configurations/hst:default/hst:templates/poll.component.ftl plus some extra code to show the custom title --> <freemarker action="copy" source="freemarker/custompoll.component.ftl" target="{{freemarkerRoot}}/{{namespace}}/custompoll.component.ftl"/> - <xml action="copy" source="freemarker/custompoll-template.xml" target="/hst:hst/hst:configurations/{{namespace}}/hst:templates"/> - </instructionSet> - - <!-- group "jsp" is used when that option is chosen in the general settings --> - <!-- NOTE: there is no demo support for jsp --> - <!-- <instructionSet group="jsp"> --> - <!-- <file action="copy" source="jsp/example.jsp" target="{{jspRoot}}/example.jsp"/> --> - <!-- <xml action="copy" source="hst/example-template-jsp.xml" target="/hst:hst/hst:configurations/hst:default/hst:templates"/> --> - <!-- </instructionSet> --> - <!-- sample data --> - <instructionSet group="sampleData"> - <xml action="copy" source="xml/content-custom-example-poll.xml" target="/content/documents/{{namespace}}/polls"/> + <!-- HST configuration --> + <xml action="copy" source="freemarker/custompoll-template.xml" target="/hst:hst/hst:configurations/{{namespace}}/hst:templates"/> <xml action="copy" source="xml/custompoll-catalogitem.xml" target="/hst:hst/hst:configurations/{{namespace}}/hst:catalog/{{namespace}}-catalog"/> <xml action="copy" source="xml/custompoll-page.xml" target="/hst:hst/hst:configurations/{{namespace}}/hst:pages"/> <xml action="copy" source="xml/custompoll-sitemapitem.xml" target="/hst:hst/hst:configurations/{{namespace}}/hst:sitemap"/> <xml action="copy" source="xml/custompoll-workspace-container.xml" target="/hst:hst/hst:configurations/{{namespace}}/hst:workspace/hst:containers"/> <xml action="copy" source="xml/menu-item.xml" target="/hst:hst/hst:configurations/{{namespace}}/hst:workspace/hst:sitemenus/main"/> - <xml action="copy" source="xml/namespace-customPollDocument.xml" target="/hippo:namespaces/{{namespace}}"/> + + <!-- content: example poll document --> + <xml action="copy" source="xml/content-custom-example-poll.xml" target="/content/documents/{{namespace}}/polls"/> + + <!-- polldata: example poll votes --> <xml action="copy" source="xml/namespaced-polldata.xml" target="/polldata"/> </instructionSet> ===================================== essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html ===================================== --- a/essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html +++ b/essentials-demo-feature/src/main/resources/META-INF/resources/feature/hippo-plugin-poll-essentials-demo-feature/hippo-plugin-poll-essentials-demo-feature.html @@ -1,7 +1,4 @@ <essentials-simple-install-plugin plugin-id="hippo-plugin-poll-essentials-demo-featureId" - has-sample-data="true"> -</essentials-simple-install-plugin> - - - + has-no-templates="true"> +</essentials-simple-install-plugin> \ No newline at end of file View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/26704d11b6ad7f19ccf6ca7d7e7aed4f2fb5b464 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/26704d11b6ad7f19ccf6ca7d7e7aed4f2fb5b464 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
