Jeroen Hoffman pushed to branch feature/HIPPLUG-1487 at cms-community /
hippo-plugin-taxonomy
Commits:
6a739eed by Arent-Jan Banck at 2017-10-05T16:23:30+02:00
HIPPLUG-1494 Update parent project to version 29.3-SNAPSHOT
- - - - -
b1773ef1 by Tobias Jeger at 2017-10-11T15:47:02+02:00
HIPPLUG-1497 Fix bootstrap warnings
(cherry picked from commit 94125ea358684bc22084aeb6d74490a4261f5b97)
- - - - -
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
- - - - -
a2e0cfcb by Jeroen Hoffman at 2017-11-20T11:28:13+01:00
HIPPLUG-1487 Merge branch 'master' into feature/HIPPLUG-1487
# Conflicts:
# demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml
- - - - -
6 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/hst-sites.yaml
- demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml
- demo/repository-data/src/main/resources/hcm-config/main.yaml
- pom.xml
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/hst-sites.yaml
=====================================
--- a/demo/repository-data/src/main/resources/hcm-config/hst-sites.yaml
+++ b/demo/repository-data/src/main/resources/hcm-config/hst-sites.yaml
@@ -1,7 +1,6 @@
definitions:
config:
/hst:hst/hst:sites:
- jcr:primaryType: hst:sites
/taxonomydemo-nl:
jcr:primaryType: hst:site
hst:content: /content/documents
=====================================
demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml
=====================================
--- a/demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml
+++ b/demo/repository-data/src/main/resources/hcm-config/hst-virtualhosts.yaml
@@ -1,9 +1,6 @@
definitions:
config:
- /hst:hst/hst:hosts:
- jcr:primaryType: hst:virtualhosts
- hst:defaultcontextpath: /site
- /dev-localhost:
+ /hst:hst/hst:hosts/dev-localhost:
jcr:primaryType: hst:virtualhostgroup
hst:cmslocation: http://localhost:8080/cms
/localhost:
=====================================
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
=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-project</artifactId>
- <version>29</version>
+ <version>29.3-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Taxonomy</name>
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/8038802bc11b194edfdd2357b371b79bca67af69...a2e0cfcbca2340f52d6c1b9a7856f058609b6ccf
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/8038802bc11b194edfdd2357b371b79bca67af69...a2e0cfcbca2340f52d6c1b9a7856f058609b6ccf
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
