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 @@
</dependency>
<dependency>
<groupId>org.onehippo.cms7</groupId>
+ <artifactId>hippo-essentials-plugin-commerce-search-box</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-essentials-plugin-projects</artifactId>
<version>${project.version}</version>
</dependency>
=====================================
plugins/commerce-search-box/pom.xml
=====================================
--- a/plugins/commerce-search-box/pom.xml
+++ b/plugins/commerce-search-box/pom.xml
@@ -25,7 +25,6 @@
</parent>
<name>Hippo Essentials Commerce Search Box Plugin</name>
- <description>Hippo Essentials Commerce Search Box Plugin</description>
<artifactId>hippo-essentials-plugin-commerce-search-box</artifactId>
<dependencies>
@@ -34,10 +33,5 @@
<artifactId>hippo-essentials-plugin-sdk-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.onehippo.cms7</groupId>
- <artifactId>hippo-essentials-plugin-sdk-implementation</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
</project>
=====================================
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 @@
-->
<instructions xmlns="http://www.onehippo.org/essentials/instructions";>
- <instructionSet group="default">
+ <instructionSet>
<xml action="copy" source="hst/product-search-page.xml"
target="/hst:hst/hst:configurations/{{namespace}}/hst:pages"/>
<xml action="copy" source="hst/product-search-sitemap.xml"
target="/hst:hst/hst:configurations/{{namespace}}/hst:sitemap"/>
<file action="copy" binary="false" overwrite="false"
source="css/product-grid.css" target="{{webfilesRoot}}/css/product-grid.css"/>
<file action="copy" binary="false" overwrite="false"
source="css/categories.css" target="{{webfilesRoot}}/css/categories.css"/>
- <file action="copy" binary="false" overwrite="false"
source="hst/commerce-components.xml"
target="{{siteOverrideFolder}}/commerce-components.xml"/>
+ <file action="copy" binary="false" overwrite="false"
source="xml/commerce-components.xml"
target="{{siteOverrideFolder}}/commerce-components.xml"/>
<file action="copy" binary="true" overwrite="false"
source="css/jquery.typeahead.min.css"
target="{{webfilesRoot}}/css/jquery.typeahead.min.css"/>
<file action="copy" binary="true" overwrite="false"
source="js/jquery.typeahead.min.js"
target="{{webfilesJsRoot}}/jquery.typeahead.min.js"/>
- <xml action="copy" overwrite="false" source="xml/commerce-search-box.xml"
target="/hst:hst/hst:configurations/hst:default/hst:catalog/essentials-catalog"/>
+ <xml action="copy" overwrite="false" source="hst/commerce-search-box.xml"
target="/hst:hst/hst:configurations/hst:default/hst:catalog/essentials-catalog"/>
<file action="copy" binary="true" overwrite="false"
source="images/commerce-search-box.png"
target="{{siteWebRoot}}/images/essentials/catalog-component-icons/commerce-search-box.png"/>
</instructionSet>
<instructionSet group="freemarker">
=====================================
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 @@
<essentials-simple-install-plugin
- plugin-id="commerce-search-box"
- has-sample-data="true"
- has-extra-templates="true">
+ plugin-id="commerce-search-box">
</essentials-simple-install-plugin>
=====================================
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 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
