You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/05/20 09:21:39 UTC
[isis] branch master updated: ISIS-2341: update demo source ref. (3)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 1f76160 ISIS-2341: update demo source ref. (3)
1f76160 is described below
commit 1f761600620a6bb96e792a4282ad36716a0e1230
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 20 11:21:30 2020 +0200
ISIS-2341: update demo source ref. (3)
---
README.adoc | 2 +-
antora/playbooks/site-comguide.yml | 2 +-
antora/playbooks/site-conguide.yml | 2 +-
antora/playbooks/site-core.yml | 2 +-
antora/playbooks/site-docs.yml | 2 +-
antora/playbooks/site-extensions.yml | 2 +-
antora/playbooks/site-incubator.yml | 2 +-
antora/playbooks/site-legacy.yml | 2 +-
antora/playbooks/site-mappings.yml | 2 +-
antora/playbooks/site-persistence.yml | 2 +-
antora/playbooks/site-refguide.yml | 2 +-
antora/playbooks/site-relnotes.yml | 2 +-
antora/playbooks/site-security.yml | 2 +-
antora/playbooks/site-setupguide.yml | 2 +-
antora/playbooks/site-subdomains.yml | 2 +-
antora/playbooks/site-testing.yml | 2 +-
antora/playbooks/site-userguide.yml | 2 +-
antora/playbooks/site-valuetypes.yml | 2 +-
antora/playbooks/site-vro.yml | 2 +-
antora/playbooks/site-vw.yml | 2 +-
antora/playbooks/site.yml | 2 +-
examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc | 4 ++--
examples/demo/domain/src/main/java/demoapp/utils/DemoStub.java | 2 +-
23 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/README.adoc b/README.adoc
index bb20bfd..3f50c10 100644
--- a/README.adoc
+++ b/README.adoc
@@ -12,7 +12,7 @@ image:https://github.com/apache-isis-committers/isis-nightly/workflows/Nightly/b
_http://isis.apache.org[Apache Isis] software is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services and repositories, and the framework dynamically generates a representation of that domain model as a webapp or a RESTful API._
Start learning about Apache Isis using the https://github.com/apache/isis-app-helloworld["Hello World"] starter app.
-Explore features with our daily built demo docker image https://github.com/apache/isis/blob/master/examples/demo/demo/src/main/adoc/modules/demo/pages/about.adoc["DemoApp"].
+Explore features with our daily built demo docker image https://github.com/apache/isis/blob/master/examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc["DemoApp"].
Build your own apps using our https://github.com/apache/isis-app-simpleapp["SimpleApp"] starter app.
For help and support, join our https://cwiki.apache.org/confluence/display/ISIS/Signing+up+to+Slack[Slack channel] or http://isis.apache.org/support.html[mailing list].
diff --git a/antora/playbooks/site-comguide.yml b/antora/playbooks/site-comguide.yml
index 2cb0ef6..361306d 100644
--- a/antora/playbooks/site-comguide.yml
+++ b/antora/playbooks/site-comguide.yml
@@ -32,7 +32,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# mavendeps
diff --git a/antora/playbooks/site-conguide.yml b/antora/playbooks/site-conguide.yml
index 17cc91e..3244063 100644
--- a/antora/playbooks/site-conguide.yml
+++ b/antora/playbooks/site-conguide.yml
@@ -32,7 +32,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# mavendeps
diff --git a/antora/playbooks/site-core.yml b/antora/playbooks/site-core.yml
index eadfc6c..896f472 100644
--- a/antora/playbooks/site-core.yml
+++ b/antora/playbooks/site-core.yml
@@ -55,7 +55,7 @@ content:
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
- url: .
start_path: examples/smoketests/src/main/adoc # core
diff --git a/antora/playbooks/site-docs.yml b/antora/playbooks/site-docs.yml
index e4c96cc..210ee2e 100644
--- a/antora/playbooks/site-docs.yml
+++ b/antora/playbooks/site-docs.yml
@@ -29,7 +29,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# mavendeps
diff --git a/antora/playbooks/site-extensions.yml b/antora/playbooks/site-extensions.yml
index 6b7a181..0ec7b3c 100644
--- a/antora/playbooks/site-extensions.yml
+++ b/antora/playbooks/site-extensions.yml
@@ -29,7 +29,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# extensions
diff --git a/antora/playbooks/site-incubator.yml b/antora/playbooks/site-incubator.yml
index ade3df7..7de1897 100644
--- a/antora/playbooks/site-incubator.yml
+++ b/antora/playbooks/site-incubator.yml
@@ -29,7 +29,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
diff --git a/antora/playbooks/site-legacy.yml b/antora/playbooks/site-legacy.yml
index 650e48e..456742b 100644
--- a/antora/playbooks/site-legacy.yml
+++ b/antora/playbooks/site-legacy.yml
@@ -29,7 +29,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# legacy
diff --git a/antora/playbooks/site-mappings.yml b/antora/playbooks/site-mappings.yml
index ab8c456..e122cd2 100644
--- a/antora/playbooks/site-mappings.yml
+++ b/antora/playbooks/site-mappings.yml
@@ -29,7 +29,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
diff --git a/antora/playbooks/site-persistence.yml b/antora/playbooks/site-persistence.yml
index 68317fd..fce9692 100644
--- a/antora/playbooks/site-persistence.yml
+++ b/antora/playbooks/site-persistence.yml
@@ -29,7 +29,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# mavendeps
diff --git a/antora/playbooks/site-refguide.yml b/antora/playbooks/site-refguide.yml
index ad1b22c..99149c9 100644
--- a/antora/playbooks/site-refguide.yml
+++ b/antora/playbooks/site-refguide.yml
@@ -45,7 +45,7 @@ content:
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# mavendeps
diff --git a/antora/playbooks/site-relnotes.yml b/antora/playbooks/site-relnotes.yml
index 254598a..7217624 100644
--- a/antora/playbooks/site-relnotes.yml
+++ b/antora/playbooks/site-relnotes.yml
@@ -32,7 +32,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# mavendeps
diff --git a/antora/playbooks/site-security.yml b/antora/playbooks/site-security.yml
index 79d0154..dba9dff 100644
--- a/antora/playbooks/site-security.yml
+++ b/antora/playbooks/site-security.yml
@@ -34,7 +34,7 @@ content:
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
diff --git a/antora/playbooks/site-setupguide.yml b/antora/playbooks/site-setupguide.yml
index 1d3eeb2..046d53d 100644
--- a/antora/playbooks/site-setupguide.yml
+++ b/antora/playbooks/site-setupguide.yml
@@ -32,7 +32,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# mavendeps
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index 2e8b661..34158ae 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -29,7 +29,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# mavendeps
diff --git a/antora/playbooks/site-testing.yml b/antora/playbooks/site-testing.yml
index b5ca28a..9d33588 100644
--- a/antora/playbooks/site-testing.yml
+++ b/antora/playbooks/site-testing.yml
@@ -29,7 +29,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# mavendeps
diff --git a/antora/playbooks/site-userguide.yml b/antora/playbooks/site-userguide.yml
index 22eac0e..41f3984 100644
--- a/antora/playbooks/site-userguide.yml
+++ b/antora/playbooks/site-userguide.yml
@@ -34,7 +34,7 @@ content:
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# extensions
diff --git a/antora/playbooks/site-valuetypes.yml b/antora/playbooks/site-valuetypes.yml
index 8a6ddac..b58ee66 100644
--- a/antora/playbooks/site-valuetypes.yml
+++ b/antora/playbooks/site-valuetypes.yml
@@ -29,7 +29,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# mavendeps
diff --git a/antora/playbooks/site-vro.yml b/antora/playbooks/site-vro.yml
index d1dea9c..148a9ff 100644
--- a/antora/playbooks/site-vro.yml
+++ b/antora/playbooks/site-vro.yml
@@ -29,7 +29,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# extensions
diff --git a/antora/playbooks/site-vw.yml b/antora/playbooks/site-vw.yml
index af65b70..4141878 100644
--- a/antora/playbooks/site-vw.yml
+++ b/antora/playbooks/site-vw.yml
@@ -29,7 +29,7 @@ content:
branches: HEAD
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
# extensions
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index ee95e9f..52d65f1 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -89,7 +89,7 @@ content:
# examples
- url: .
- start_path: examples/demo/demo/src/main/adoc # docs
+ start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
- url: .
start_path: examples/smoketests/src/main/adoc # core
diff --git a/examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc b/examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc
index 13bd935..6a2531c 100644
--- a/examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc
+++ b/examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc
@@ -8,9 +8,9 @@ It is bundled as a Docker image (link:https://hub.docker.com/r/apacheisis/demo-s
The app allows you to learn the very basics with a minimum of hassle.
You can also use it to discover some of the more advanced features that the framework has to offer.
-image::https://raw.githubusercontent.com/apache/isis/master/examples/demo/demo/src/main/adoc/modules/demo/images/teaser-light.png[link="https://raw.githubusercontent.com/apache/isis/master/examples/demo/demo/src/main/adoc/modules/demo/images/teaser-light.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/examples/demo/domain/src/main/adoc/modules/demo/images/teaser-light.png[link="https://raw.githubusercontent.com/apache/isis/master/examples/demo/domain/src/main/adoc/modules/demo/images/teaser-light.png"]
-image::https://raw.githubusercontent.com/apache/isis/master/examples/demo/demo/src/main/adoc/modules/demo/images/teaser-dark.png[link="https://raw.githubusercontent.com/apache/isis/master/examples/demo/demo/src/main/adoc/modules/demo/images/teaser-dark.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/examples/demo/domain/src/main/adoc/modules/demo/images/teaser-dark.png[link="https://raw.githubusercontent.com/apache/isis/master/examples/demo/domain/src/main/adoc/modules/demo/images/teaser-dark.png"]
== Prereqs
diff --git a/examples/demo/domain/src/main/java/demoapp/utils/DemoStub.java b/examples/demo/domain/src/main/java/demoapp/utils/DemoStub.java
index 42c5001..5738eef 100644
--- a/examples/demo/domain/src/main/java/demoapp/utils/DemoStub.java
+++ b/examples/demo/domain/src/main/java/demoapp/utils/DemoStub.java
@@ -50,7 +50,7 @@ public abstract class DemoStub {
private static Map<String, String> createConstants() {
val map = new HashMap<String, String>();
map.put("SOURCES_ISIS", "https://github.com/apache/isis/blob/master/core/applib/src/main/java");
- map.put("SOURCES_DEMO", "https://github.com/apache/isis/tree/master/examples/demo/demo/src/main/java");
+ map.put("SOURCES_DEMO", "https://github.com/apache/isis/tree/master/examples/demo/domain/src/main/java");
map.put("ISSUES_DEMO", "https://issues.apache.org/jira/");
return map;
}