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 2022/10/21 07:05:25 UTC
[isis] branch master updated: ISIS-3142: tooling: update showcase templates
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 bddf9cdc2a ISIS-3142: tooling: update showcase templates
bddf9cdc2a is described below
commit bddf9cdc2a9f141821de25c066088bbd5ccb6846
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Oct 21 09:05:11 2022 +0200
ISIS-3142: tooling: update showcase templates
---
.../metaprog/demoshowcases/value/ValueShowCase.java | 18 +++++++++---------
.../metaprog/src/main/resources/$Templates.layout.xml | 6 +++---
.../main/resources/jdo/$TemplateJdo-description.adoc | 6 +++---
.../main/resources/jpa/$TemplateJpa-description.adoc | 6 +++---
.../metaprog/src/main/resources/jpa/$TemplateJpa.java | 4 ++--
.../src/main/resources/jpa/$TemplateJpa~lob.java | 4 ++--
.../src/main/resources/jpa/$TemplateJpa~primitive.java | 4 ++--
.../resources/persistence/$TemplateEntity.layout.xml | 6 +++---
.../persistence/$TemplateEntity~primitive.layout.xml | 6 +++---
.../src/main/resources/vm/$TemplateVm-description.adoc | 4 ++--
.../src/main/resources/vm/$TemplateVm.layout.xml | 6 +++---
.../main/resources/vm/$TemplateVm~primitive.layout.xml | 6 +++---
12 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueShowCase.java b/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueShowCase.java
index 40c06325c2..6f96b0b383 100644
--- a/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueShowCase.java
+++ b/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueShowCase.java
@@ -19,9 +19,9 @@
package org.apache.causeway.tooling.metaprog.demoshowcases.value;
import org.apache.causeway.tooling.metaprog.demoshowcases.value.ValueTypeGenTemplate.Config;
+import org.apache.causeway.tooling.metaprog.demoshowcases.value.ValueTypeGenTemplate.Config.ConfigBuilder;
import org.apache.causeway.tooling.metaprog.demoshowcases.value.ValueTypeGenTemplate.Template;
import org.apache.causeway.tooling.metaprog.demoshowcases.value.ValueTypeGenTemplate.TemplateVariant;
-import org.apache.causeway.tooling.metaprog.demoshowcases.value.ValueTypeGenTemplate.Config.ConfigBuilder;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -31,28 +31,28 @@ import lombok.val;
public enum ValueShowCase {
MARKUP(Config.builder()
- .showcaseName("IsisMarkup")
- .javaPackage("demoapp.dom.types.isis.markups")
+ .showcaseName("CausewayMarkup")
+ .javaPackage("demoapp.dom.types.causeway.markups")
.showcaseValueType("org.apache.causeway.applib.value.Markup")
.showcaseValueSemantics("org.apache.causeway.core.metamodel.valuesemantics.MarkupValueSemantics")
.templateVariant(TemplateVariant.LOB)),
MARKDOWN(Config.builder()
- .showcaseName("IsisMarkdown")
- .javaPackage("demoapp.dom.types.isisval.markdowns")
+ .showcaseName("CausewayMarkdown")
+ .javaPackage("demoapp.dom.types.causewayval.markdowns")
.showcaseValueType("org.apache.causeway.valuetypes.markdown.applib.value.Markdown")
.showcaseValueSemantics("org.apache.causeway.valuetypes.markdown.metamodel.semantics.MarkdownValueSemantics")
.templates(Template.REGULAR_SET_NO_SAMPLES) // demo provides its own MarkdownSamples
.templateVariant(TemplateVariant.LOB)),
ASCIIDOC(Config.builder()
- .showcaseName("IsisAsciiDoc")
- .javaPackage("demoapp.dom.types.isisval.asciidocs")
+ .showcaseName("CausewayAsciiDoc")
+ .javaPackage("demoapp.dom.types.causewayval.asciidocs")
.showcaseValueType("org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc")
.showcaseValueSemantics("org.apache.causeway.valuetypes.asciidoc.metamodel.semantics.AsciiDocValueSemantics")
.templates(Template.REGULAR_SET_NO_SAMPLES) // demo provides its own AsciiDocSamples
.templateVariant(TemplateVariant.LOB)),
VEGA(Config.builder()
- .showcaseName("IsisVega")
- .javaPackage("demoapp.dom.types.isisval.vegas")
+ .showcaseName("CausewayVega")
+ .javaPackage("demoapp.dom.types.causewayval.vegas")
.showcaseValueType("org.apache.causeway.valuetypes.vega.applib.value.Vega")
.showcaseValueSemantics("org.apache.causeway.valuetypes.vega.metamodel.semantics.VegaValueSemantics")
.templateVariant(TemplateVariant.LOB)),
diff --git a/tooling/metaprog/src/main/resources/$Templates.layout.xml b/tooling/metaprog/src/main/resources/$Templates.layout.xml
index f8293ec232..0558879745 100644
--- a/tooling/metaprog/src/main/resources/$Templates.layout.xml
+++ b/tooling/metaprog/src/main/resources/$Templates.layout.xml
@@ -10,9 +10,9 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://causeway.apache.org/applib/layout/component"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!--${generated-file-notice}-->
diff --git a/tooling/metaprog/src/main/resources/jdo/$TemplateJdo-description.adoc b/tooling/metaprog/src/main/resources/jdo/$TemplateJdo-description.adoc
index cae6190d57..2e13e63845 100644
--- a/tooling/metaprog/src/main/resources/jdo/$TemplateJdo-description.adoc
+++ b/tooling/metaprog/src/main/resources/jdo/$TemplateJdo-description.adoc
@@ -11,9 +11,9 @@ include::$TemplateJdo.java[tags=class]
<.> a no-arg constructor is introduced by JDO enhancer
<.> required property as defined to JDO/DataNucleus.
+
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
<.> optional property as defined to JDO/DataNucleus
diff --git a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa-description.adoc b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa-description.adoc
index 8af1ad50ad..4b00558197 100644
--- a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa-description.adoc
+++ b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa-description.adoc
@@ -11,9 +11,9 @@ include::$TemplateJpa.java[tags=class]
<.> a no-arg constructor for convenience
<.> required property as defined to JPA.
+
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
<.> optional property as defined to JPA
diff --git a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java
index 27c6ba90c7..7739780393 100644
--- a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java
+++ b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import /*${showcase-java-package}*/.persistence./*${showcase-name}*/Entity;
schema = "demo",
name = "/*${showcase-name}*/Jpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo./*${showcase-name}*/Entity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~lob.java b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~lob.java
index ed9ebb307d..9f371131a2 100644
--- a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~lob.java
+++ b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~lob.java
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -54,7 +54,7 @@ import /*${showcase-java-package}*/.persistence./*${showcase-name}*/Entity;
schema = "demo",
name = "/*${showcase-name}*/Jpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo./*${showcase-name}*/Entity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~primitive.java b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~primitive.java
index d02584d02a..5654af2ff4 100644
--- a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~primitive.java
+++ b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~primitive.java
@@ -32,7 +32,7 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import /*${showcase-java-package}*/.persistence./*${showcase-name}*/Entity;
schema = "demo",
name = "/*${showcase-name}*/Jpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo./*${showcase-name}*/Entity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.layout.xml b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.layout.xml
index fb7f017a0c..e783bc3033 100644
--- a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.layout.xml
+++ b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.layout.xml
@@ -10,9 +10,9 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://causeway.apache.org/applib/layout/component"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!--${generated-file-notice}-->
diff --git a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity~primitive.layout.xml b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity~primitive.layout.xml
index 4b26310073..0cc324f61c 100644
--- a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity~primitive.layout.xml
+++ b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity~primitive.layout.xml
@@ -10,9 +10,9 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://causeway.apache.org/applib/layout/component"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!--${generated-file-notice}-->
diff --git a/tooling/metaprog/src/main/resources/vm/$TemplateVm-description.adoc b/tooling/metaprog/src/main/resources/vm/$TemplateVm-description.adoc
index f0658ab66f..b93737d8a4 100644
--- a/tooling/metaprog/src/main/resources/vm/$TemplateVm-description.adoc
+++ b/tooling/metaprog/src/main/resources/vm/$TemplateVm-description.adoc
@@ -10,8 +10,8 @@ include::$TemplateVm.java[tags=class]
----
<.> a no-arg constructor is required by JAXB
<.> required property as defined to JAXB
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
+
This is the default for JAXB so no additional annotation required.
diff --git a/tooling/metaprog/src/main/resources/vm/$TemplateVm.layout.xml b/tooling/metaprog/src/main/resources/vm/$TemplateVm.layout.xml
index fb7f017a0c..e783bc3033 100644
--- a/tooling/metaprog/src/main/resources/vm/$TemplateVm.layout.xml
+++ b/tooling/metaprog/src/main/resources/vm/$TemplateVm.layout.xml
@@ -10,9 +10,9 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://causeway.apache.org/applib/layout/component"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!--${generated-file-notice}-->
diff --git a/tooling/metaprog/src/main/resources/vm/$TemplateVm~primitive.layout.xml b/tooling/metaprog/src/main/resources/vm/$TemplateVm~primitive.layout.xml
index 4b26310073..0cc324f61c 100644
--- a/tooling/metaprog/src/main/resources/vm/$TemplateVm~primitive.layout.xml
+++ b/tooling/metaprog/src/main/resources/vm/$TemplateVm~primitive.layout.xml
@@ -10,9 +10,9 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://causeway.apache.org/applib/layout/component"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!--${generated-file-notice}-->