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 @@
</dependency>
<dependency>
<groupId>org.onehippo.cms7</groupId>
+
<artifactId>hippo-essentials-plugin-commerce-search-results-category</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onehippo.cms7</groupId>
+
<artifactId>hippo-essentials-plugin-commerce-search-results-products</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-results-category/pom.xml
=====================================
--- a/plugins/commerce-search-results-category/pom.xml
+++ b/plugins/commerce-search-results-category/pom.xml
@@ -24,9 +24,7 @@
<version>4.1.0-SNAPSHOT</version>
</parent>
-
- <name>Hippo Essentials commerce-search-results-category</name>
- <description>Hippo Essentials commerce-search-results-category
Plugin</description>
+ <name>Hippo Essentials Commerce Search Results Category</name>
<artifactId>hippo-essentials-plugin-commerce-search-results-category</artifactId>
<dependencies>
@@ -35,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-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 @@
<instructions xmlns="http://www.onehippo.org/essentials/instructions";>
<instructionSet group="default">
- <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="false" overwrite="false"
source="css/categories.css" target="{{webfilesRoot}}/css/categories.css"/>
- <xml action="copy" overwrite="false"
source="xml/commerce-search-category-list.xml"
target="/hst:hst/hst:configurations/hst:default/hst:catalog/essentials-catalog"/>
+ <xml action="copy" overwrite="false"
source="hst/commerce-search-category-list.xml"
target="/hst:hst/hst:configurations/hst:default/hst:catalog/essentials-catalog"/>
<file action="copy" binary="true" overwrite="false"
source="images/commerce-search-category-list.png"
target="{{siteWebRoot}}/images/essentials/catalog-component-icons/commerce-search-category-list.png"/>
</instructionSet>
<instructionSet group="freemarker">
=====================================
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 @@
<essentials-simple-install-plugin
- plugin-id="commerce-search-results-category"
- has-sample-data="true"
- has-extra-templates="true">
+ plugin-id="commerce-search-results-category">
</essentials-simple-install-plugin>
=====================================
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
=====================================
---
a/plugins/commerce-search-results-category/src/main/resources/plugin-descriptor.json
+++
b/plugins/commerce-search-results-category/src/main/resources/plugin-descriptor.json
@@ -8,7 +8,6 @@
"introduction": "Commerce Search results (category list)",
"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-results-category",
- "hasConfiguration": false,
"packageFile" :
"/META-INF/commerce-search-results-category_instructions.xml",
"type": "feature",
"icon" : "/essentials/images/commerce-search-category-list.png",
=====================================
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
=====================================
--- a/plugins/commerce-search-results-products/pom.xml
+++ b/plugins/commerce-search-results-products/pom.xml
@@ -23,19 +23,14 @@
<artifactId>hippo-essentials-plugins</artifactId>
<version>4.1.0-SNAPSHOT</version>
</parent>
- <name>Hippo Essentials Commerce Search Results Products Plugin</name>
- <description>Hippo Essentials Commerce Search Results Products
Plugin</description>
+ <name>Hippo Essentials Commerce Search Results Products</name>
<artifactId>hippo-essentials-plugin-commerce-search-results-products</artifactId>
+
<dependencies>
<dependency>
<groupId>org.onehippo.cms7</groupId>
<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-results-products/src/main/resources/META-INF/commerce-search-results-products_instructions.xml
=====================================
---
a/plugins/commerce-search-results-products/src/main/resources/META-INF/commerce-search-results-products_instructions.xml
+++
b/plugins/commerce-search-results-products/src/main/resources/META-INF/commerce-search-results-products_instructions.xml
@@ -21,9 +21,9 @@
<xml action="copy" overwrite="false"
source="hst/commerce-search-product-list-freemarker.xml"
target="/hst:hst/hst:configurations/hst:default/hst:templates"/>
</instructionSet>
<instructionSet group="default">
- <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="false" overwrite="false"
source="css/product-grid.css" target="{{webfilesRoot}}/css/product-grid.css"/>
- <xml action="copy" overwrite="false"
source="xml/commerce-search-product-list.xml"
target="/hst:hst/hst:configurations/hst:default/hst:catalog/essentials-catalog"/>
+ <xml action="copy" overwrite="false"
source="hst/commerce-search-product-list.xml"
target="/hst:hst/hst:configurations/hst:default/hst:catalog/essentials-catalog"/>
<file action="copy" binary="true" overwrite="false"
source="images/commerce-search-product-list.png"
target="{{siteWebRoot}}/images/essentials/catalog-component-icons/commerce-search-product-list.png"/>
</instructionSet>
</instructions>
=====================================
plugins/commerce-search-results-products/src/main/resources/META-INF/resources/feature/commerce-search-results-products/commerce-search-results-products.html
=====================================
---
a/plugins/commerce-search-results-products/src/main/resources/META-INF/resources/feature/commerce-search-results-products/commerce-search-results-products.html
+++
b/plugins/commerce-search-results-products/src/main/resources/META-INF/resources/feature/commerce-search-results-products/commerce-search-results-products.html
@@ -17,7 +17,5 @@
<essentials-simple-install-plugin
- plugin-id="commerce-search-results-products"
- has-sample-data="true"
- has-extra-templates="true">
+ plugin-id="commerce-search-results-products">
</essentials-simple-install-plugin>
=====================================
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
=====================================
---
a/plugins/commerce-search-results-products/src/main/resources/plugin-descriptor.json
+++
b/plugins/commerce-search-results-products/src/main/resources/plugin-descriptor.json
@@ -8,7 +8,6 @@
"introduction": "Commerce Search results (product list)",
"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-results-products",
- "hasConfiguration": false,
"packageFile" :
"/META-INF/commerce-search-results-products_instructions.xml",
"type": "feature",
"icon" : "/essentials/images/commerce-search-product-list.png",
=====================================
plugins/commerce-search-results-products/src/main/resources/hst/commerce-components.xml
→
plugins/commerce-search-results-products/src/main/resources/xml/commerce-components.xml
=====================================
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/4b78b6e82f83d2455fbd3814675e48a991bfea3c
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/4b78b6e82f83d2455fbd3814675e48a991bfea3c
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
