diff --git a/_redirects b/_redirects index d3af8679..d86af141 100644 --- a/_redirects +++ b/_redirects @@ -2,10 +2,10 @@ /hazelcast /home 200! # Redirect latest management-center alias to the latest version -/management-center/latest/* /management-center/5.5/:splat 200! +/management-center/latest/* /management-center/5.6/:splat 200! # Redirect latest-dev management-center alias to the latest version -/management-center/latest-dev/* /management-center/5.6-snapshot/:splat 200! +/management-center/latest-dev/* /management-center/6.0-snapshot/:splat 200! # Redirect latest cloud-only management-center alias to the latest version /management-center/5.4-CLOUD-1/* /management-center/5.4-snapshot/:splat 200! @@ -17,11 +17,14 @@ /hazelcast/latest-dev/* /hazelcast/6.0-snapshot/:splat 200! # Redirect latest operator alias to the latest version -/operator/latest/* /operator/5.13/:splat 200! +/operator/latest/* /operator/5.14/:splat 200! # Redirect latest-dev operator alias to the latest-dev version /operator/latest-dev/* /operator/latest-snapshot/:splat 200! +# Redirect latest Flow alias to the latest version +/flow/latest/* /flow/5.5/:splat 200! + # Redirect latest imdg alias to the latest version /imdg/latest/* /imdg/4.2/:splat 200! @@ -32,7 +35,7 @@ /clc/latest-dev/* /clc/latest/:splat 200! # Redirect latest clc alias to the latest version -/clc/latest/* /clc/5.4.0/:splat 200! +/clc/latest/* /clc/5.4.1/:splat 200! # Redirect legacy /4 version to the /4.0 version /imdg/4/* /imdg/4.0/:splat 301! diff --git a/antora-playbook-local.yml b/antora-playbook-local.yml index 75c4e1b9..e83e635c 100644 --- a/antora-playbook-local.yml +++ b/antora-playbook-local.yml @@ -10,11 +10,14 @@ site: content: sources: - url: . - start_paths: [home, tutorials] + start_paths: [home, tutorials, templates] branches: HEAD - url: https://github.com/hazelcast/hz-docs branches: [main, v/*] start_path: docs + - url: https://github.com/hazelcast/hz-flow-docs + branches: [main] + start_path: docs - url: https://github.com/hazelcast/imdg-docs branches: [v/*] start_path: docs @@ -78,8 +81,6 @@ content: - url: https://github.com/hazelcast/hazelcast-cloud-maven-plugin branches: main start_path: docs - - url: https://github.com/hazelcast-guides/adoc-templates.git - branches: antora-doc - url: https://github.com/hazelcast-guides/caching-springboot-jcache branches: master start_path: docs @@ -314,6 +315,18 @@ antora: branch: includes: - 5.5.0 + - name: management-center + version: "5.6" + mappings: + - module: integrate + family: attachment + origin: + url: + include: + - '**/hazelcast/management-center' + branch: + includes: + - 5.6.0 - require: ./lib/api_json.js tags: - Favorites diff --git a/antora-playbook.yml b/antora-playbook.yml index dbd67bda..03285d71 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -16,11 +16,14 @@ urls: content: sources: - url: . - start_paths: [home, tutorials] + start_paths: [home, tutorials, templates] branches: HEAD - url: https://github.com/hazelcast/hz-docs branches: [main, v/*] start_path: docs + - url: https://github.com/hazelcast/hz-flow-docs + branches: [main] + start_path: docs - url: https://github.com/hazelcast/imdg-docs branches: [v/*] start_path: docs @@ -84,8 +87,6 @@ content: - url: https://github.com/hazelcast/hazelcast-cloud-maven-plugin branches: main start_path: docs - - url: https://github.com/hazelcast-guides/adoc-templates.git - branches: antora-doc - url: https://github.com/hazelcast-guides/caching-springboot-jcache branches: master start_path: docs @@ -198,10 +199,10 @@ content: branches: master start_path: docs - url: https://github.com/hazelcast/hazelcast-mono - branches: [master, 5.5.0] + branches: [master, 5.5.z] start_path: docs/rest - url: https://github.com/hazelcast/management-center - branches: [master, 5.4.0, 5.5.0] + branches: [master, 5.4.0, 5.5.0, 5.6.0] start_path: hazelcast-management-center/src/openapi/external - url: https://github.com/hazelcast/management-center branches: [5.1.z, 5.2.z, 5.3.0] @@ -259,6 +260,18 @@ antora: branch: includes: - 'master' + - name: management-center + version: "5.6" + mappings: + - module: integrate + family: attachment + origin: + url: + include: + - '**/hazelcast/management-center' + branch: + includes: + - 5.6.0 - require: '@djencks/antora-aggregate-collector' trace: true componentversions: @@ -273,9 +286,9 @@ antora: - '**/hazelcast/hazelcast-mono' branch: includes: - - '5.5.0' + - '5.5.z' - name: management-center - version: '6.0-snapshot' + version: '5.6-snapshot' mappings: - module: integrate family: attachment @@ -346,6 +359,18 @@ antora: branch: includes: - '5.4.0' + - name: management-center + version: "5.6" + mappings: + - module: integrate + family: attachment + origin: + url: + include: + - '**/hazelcast/management-center' + branch: + includes: + - 5.6.0 # Needed for API calls from Cloud Web App (Learning Centre page) - require: ./lib/api_json.js tags: diff --git a/search-config.json b/search-config.json index 74a1de1f..810fa0ab 100644 --- a/search-config.json +++ b/search-config.json @@ -8,6 +8,18 @@ ], "selectors_key": "tutorials" }, + { + "url": "https://docs.hazelcast.com/flow/(?P.*?)/", + "tags": [ + "flow-5.5" + ], + "variables": { + "version": [ + "5.5" + ] + }, + "selectors_key": "flow" + }, { "url": "https://docs.hazelcast.com/imdg/(?P.*?)/", "tags": [ @@ -23,11 +35,11 @@ { "url": "https://docs.hazelcast.com/management-center/(?P.*?)/", "tags": [ - "management-center-5.6-snapshot" + "management-center-6.0-snapshot" ], "variables": { "version": [ - "5.6-snapshot" + "6.0-snapshot" ] }, "selectors_key": "mc" @@ -159,6 +171,18 @@ ], "selectors_key": "cloud" }, + { + "url": "https://docs.hazelcast.com/clc/(?P.*?)/", + "tags": [ + "clc-5.5.0" + ], + "variables": { + "version": [ + "5.5.0" + ] + }, + "selectors_key": "command-line-client" + }, { "url": "https://docs.hazelcast.com/clc/(?P.*?)/", "tags": [ @@ -219,6 +243,18 @@ }, "selectors_key": "command-line-client" }, + { + "url": "https://docs.hazelcast.com/operator/(?P.*?)/", + "tags": [ + "operator-5.14" + ], + "variables": { + "version": [ + "5.14" + ] + }, + "selectors_key": "operator" + }, { "url": "https://docs.hazelcast.com/operator/(?P.*?)/", "tags": [ @@ -386,6 +422,18 @@ ] }, "selectors_key": "mc" + }, + { + "url": "https://docs.hazelcast.com/management-center/(?P.*?)/", + "tags": [ + "management-center-5.6" + ], + "variables": { + "version": [ + "5.6" + ] + }, + "selectors_key": "mc" } ], "sitemap_urls": [ @@ -511,6 +559,22 @@ "lvl2": ".doc h2", "lvl3": ".doc h3", "text": ".doc p, .doc td.content, .doc th.tableblock" + }, + "flow": { + "lvl0": { + "selector": "/html[1]/body[1]/div[1]/main[1]/div[1]/article[1]/nav[1]/ul[1]/li[1]/a[1]", + "type": "xpath", + "global": true, + "default_value": "Flow" + }, + "lvl1": { + "selector": "/html[1]/body[1]/div[1]/main[1]/div[1]/article[1]/nav[1]/ul[1]/li[2]", + "type": "xpath", + "global": true + }, + "lvl2": ".doc h1", + "lvl3": ".doc h2", + "text": ".doc p, .doc td.content, .doc th.tableblock" } }, "custom_settings": { diff --git a/templates/antora.yml b/templates/antora.yml new file mode 100644 index 00000000..57e08435 --- /dev/null +++ b/templates/antora.yml @@ -0,0 +1,7 @@ +name: templates +title: Templates +version: v0.1 +nav: + - modules/ROOT/nav.adoc + + diff --git a/templates/modules/ROOT/pages/microservices/application-structure.adoc b/templates/modules/ROOT/pages/microservices/application-structure.adoc new file mode 100644 index 00000000..019251bf --- /dev/null +++ b/templates/modules/ROOT/pages/microservices/application-structure.adoc @@ -0,0 +1,8 @@ +// {framework} -> The name of the microservices framework + +ifdef::framework[] +The application is a basic {framework} app having 2 endpoints defined in `CommandController`: + +- `/put` is the page where key and values can be put on a Hazelcast distributed map. It takes `key` and `value` as query parameters and returns the entry in JSON format. +- `/get` is the page where the values in the Hazelcast distributed map can be obtained by keys. It takes `key` as query parameter and returns the found entry in JSON format. +endif::[] diff --git a/templates/modules/ROOT/pages/microservices/prerequisites.adoc b/templates/modules/ROOT/pages/microservices/prerequisites.adoc new file mode 100644 index 00000000..1d0a9e8c --- /dev/null +++ b/templates/modules/ROOT/pages/microservices/prerequisites.adoc @@ -0,0 +1,3 @@ +- A text editor or IDE +- JDK 1.8+ +- Apache Maven 3.2+ \ No newline at end of file diff --git a/templates/modules/ROOT/pages/microservices/what-you-will-learn.adoc b/templates/modules/ROOT/pages/microservices/what-you-will-learn.adoc new file mode 100644 index 00000000..00b9ca69 --- /dev/null +++ b/templates/modules/ROOT/pages/microservices/what-you-will-learn.adoc @@ -0,0 +1,7 @@ +// {framework} -> The name of the microservices framework + +ifdef::framework[] +In this guide, you will learn how to use Hazelcast IMDG within {framework} microservices. + +The {framework} application contains two REST controllers which helps you to put data and read it back. The application initializes a single Hazelcast IMDG member instance which is used to keep the data. When you run the application multiple times, Hazelcast IMDG instances build a cluster and share the data. +endif::[] diff --git a/templates/modules/ROOT/pages/start-hz-cluster.adoc b/templates/modules/ROOT/pages/start-hz-cluster.adoc new file mode 100644 index 00000000..74f4e563 --- /dev/null +++ b/templates/modules/ROOT/pages/start-hz-cluster.adoc @@ -0,0 +1,46 @@ +[tabs] +==== + +Hazelcast Cloud:: ++ +-- +You can easily create a Hazelcast cluster on https://cloud.hazelcast.com[Hazelcast Cloud] with just a few clicks. See https://docs.cloud.hazelcast.com/docs/getting-started[Getting Started] documentation for details. +-- + +Docker Image:: ++ +-- +You can start members inside Docker containers. See the https://github.com/hazelcast/hazelcast-docker[documentation] for details. +[source, bash] +---- +$ docker run hazelcast/hazelcast:$HAZELCAST_VERSION +---- +-- + +Hazelcast CLI:: ++ +-- +You can start members via Hazelcast CLI. See the https://github.com/hazelcast/hazelcast-command-line[documentation] for the installation instructions and details. +[source, bash] +---- +$ hz start +---- +-- + +Download Packages:: ++ +-- +You can start members via `start` script in https://hazelcast.org/imdg/download[IMDG bundle]. +[source, bash] +---- +$ sh bin/start.sh +---- +-- +==== + +[NOTE] +==== +You can find other ways of starting Hazelcast members and forming a cluster +https://docs.hazelcast.org/docs/latest/manual/html-single/#installing-hazelcast-imdg[here]. +==== +