This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch v3 in repository https://gitbox.apache.org/repos/asf/causeway-app-referenceapp.git
commit 58286eef4a24f6698b6900d243bcf1b3c5779239 Merge: 1045a78 b34990d Author: andi-huber <[email protected]> AuthorDate: Tue Apr 2 06:56:44 2024 +0200 merge from master codegen/pom.xml | 75 ++++ .../compiler/JavaSourceCompilingClassLoader.java | 147 +++++++ .../codegen/demoshowcases/value/ValueShowCase.java | 433 +++++++++++++++++++++ .../demoshowcases/value/ValueTypeGenTemplate.java | 377 ++++++++++++++++++ codegen/src/main/resources/$Templates-common.adoc | 66 ++++ .../resources/$Templates-common~primitive.adoc | 59 +++ .../src/main/resources/$Templates-description.adoc | 26 ++ .../$Templates-description~primitive.adoc | 27 ++ codegen/src/main/resources/$Templates.java | 84 ++++ codegen/src/main/resources/$Templates.layout.xml | 60 +++ .../src/main/resources/$Templates~primitive.java | 82 ++++ .../src/main/resources/holder/$TemplateHolder.java | 42 ++ .../main/resources/holder/$TemplateHolder2.java | 75 ++++ .../holder/$TemplateHolder2~primitive.java | 74 ++++ .../holder/$TemplateHolder_actionReturning.java | 40 ++ .../$TemplateHolder_actionReturningArray.java | 52 +++ ...plateHolder_actionReturningArray~primitive.java | 50 +++ .../$TemplateHolder_actionReturningCollection.java | 51 +++ ...Holder_actionReturningCollection~primitive.java | 49 +++ .../$TemplateHolder_actionReturning~primitive.java | 38 ++ .../holder/$TemplateHolder_mixinProperty.java | 42 ++ .../$TemplateHolder_mixinProperty~primitive.java | 40 ++ ...plateHolder_updateReadOnlyOptionalProperty.java | 60 +++ ..._updateReadOnlyOptionalPropertyWithChoices.java | 73 ++++ .../$TemplateHolder_updateReadOnlyProperty.java | 55 +++ ...teHolder_updateReadOnlyPropertyWithChoices.java | 70 ++++ ...pdateReadOnlyPropertyWithChoices~primitive.java | 68 ++++ ...ateHolder_updateReadOnlyProperty~primitive.java | 53 +++ .../holder/$TemplateHolder~primitive.java | 34 ++ .../resources/jdo/$TemplateJdo-description.adoc | 18 + .../jdo/$TemplateJdo-description~primitive.adoc | 13 + codegen/src/main/resources/jdo/$TemplateJdo.java | 85 ++++ .../main/resources/jdo/$TemplateJdoEntities.java | 42 ++ .../jdo/$TemplateJdoEntities~primitive.java | 40 ++ .../src/main/resources/jdo/$TemplateJdo~lob.java | 86 ++++ .../main/resources/jdo/$TemplateJdo~primitive.java | 67 ++++ .../resources/jpa/$TemplateJpa-description.adoc | 18 + .../jpa/$TemplateJpa-description~primitive.adoc | 13 + codegen/src/main/resources/jpa/$TemplateJpa.java | 97 +++++ .../main/resources/jpa/$TemplateJpaEntities.java | 42 ++ .../jpa/$TemplateJpaEntities~primitive.java | 40 ++ .../src/main/resources/jpa/$TemplateJpa~lob.java | 101 +++++ .../main/resources/jpa/$TemplateJpa~primitive.java | 79 ++++ .../resources/persistence/$TemplateEntity.java | 44 +++ .../persistence/$TemplateEntity.layout.xml | 59 +++ .../persistence/$TemplateEntity~primitive.java | 42 ++ .../$TemplateEntity~primitive.layout.xml | 58 +++ .../resources/persistence/$TemplateSeeding.java | 39 ++ .../persistence/$TemplateSeeding~primitive.java | 37 ++ .../main/resources/samples/$TemplateSamples.java | 39 ++ .../samples/$TemplateSamples~primitive.java | 37 ++ .../main/resources/vm/$TemplateVm-description.adoc | 17 + .../vm/$TemplateVm-description~primitive.adoc | 12 + codegen/src/main/resources/vm/$TemplateVm.java | 86 ++++ .../src/main/resources/vm/$TemplateVm.layout.xml | 59 +++ .../main/resources/vm/$TemplateVm~primitive.java | 69 ++++ .../resources/vm/$TemplateVm~primitive.layout.xml | 58 +++ .../value/ValueTypeGenTemplateTest.java | 196 ++++++++++ .../src/test/resources/junit-platform.properties | 37 ++ codegen/src/test/resources/log4j2-test.xml | 56 +++ domain-tests/pom.xml | 7 +- domain/pom.xml | 2 +- pom.xml | 2 +- testing/pom.xml | 2 +- web/pom.xml | 2 +- wicket/common/pom.xml | 2 +- wicket/jdo/pom.xml | 2 +- wicket/jpa-and-graphql/pom.xml | 4 +- .../webapp/wicket/jpa/DemoAppWicketJpa.java | 4 +- wicket/jpa/pom.xml | 2 +- 70 files changed, 4102 insertions(+), 15 deletions(-) diff --cc codegen/pom.xml index 0000000,631786c..e69565f mode 000000,100644..100644 --- a/codegen/pom.xml +++ b/codegen/pom.xml @@@ -1,0 -1,75 +1,75 @@@ + <?xml version="1.0" encoding="UTF-8"?> + <!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> + <project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.causeway.examples.apps</groupId> + <artifactId>reference-app-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>reference-app-codegen</artifactId> + + <name>Reference App - Code Generator</name> + + <properties> + <javapoet.version>1.13.0</javapoet.version> + <skipTests>true</skipTests> + <enforcer.skip>true</enforcer.skip> + </properties> + + <dependencies> + + <dependency> + <groupId>org.apache.causeway.commons</groupId> + <artifactId>causeway-commons</artifactId> + </dependency> + + <!-- JAVA META PROGRAMMING --> + + <dependency> + <groupId>com.squareup</groupId> + <artifactId>javapoet</artifactId> + <version>${javapoet.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <!-- TESTING --> + + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-internaltestsupport</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + </project> + + diff --cc domain-tests/pom.xml index b2b1add,fd6581c..a310562 --- a/domain-tests/pom.xml +++ b/domain-tests/pom.xml @@@ -16,12 -16,12 +16,12 @@@ <parent> <groupId>org.apache.causeway.examples.apps</groupId> - <artifactId>demo-parent</artifactId> + <artifactId>reference-app-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> - <artifactId>reference-app-domain-tests</artifactId> - <name>Reference App - Domain Tests</name> + <artifactId>demo-domain-tests</artifactId> + <name>Demo - Domain Tests</name> <description>Introduced to allow for JUnit integration tests with the demo-domain.</description> <properties> @@@ -70,17 -70,17 +70,16 @@@ <dependency> <groupId>org.apache.causeway.valuetypes</groupId> -- <artifactId>causeway-valuetypes-asciidoc-ui</artifactId> - <version>3.0.0-SNAPSHOT</version> - <version>2.0.0-SNAPSHOT</version> - </dependency> ++ <artifactId>causeway-valuetypes-asciidoc-ui-wkt</artifactId> + </dependency> <!-- provides DomainObjectTesterFactory --> <dependency> <groupId>org.apache.causeway.regressiontests</groupId> -- <artifactId>causeway-regressiontests-stable</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <artifactId>causeway-regressiontests-base</artifactId> + <version>3.0.0-SNAPSHOT</version> </dependency> - + </dependencies> </project> diff --cc domain/pom.xml index 059d872,8c07f3f..62a7a28 --- a/domain/pom.xml +++ b/domain/pom.xml @@@ -16,12 -16,12 +16,12 @@@ <parent> <groupId>org.apache.causeway.examples.apps</groupId> - <artifactId>demo-parent</artifactId> + <artifactId>reference-app-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> - <artifactId>reference-app-domain</artifactId> - <name>Reference App - Domain</name> + <artifactId>demo-domain</artifactId> + <name>Demo - Domain</name> <properties> </properties> diff --cc pom.xml index 34e5659,76263f9..5fe3f0f --- a/pom.xml +++ b/pom.xml @@@ -21,9 -22,9 +21,9 @@@ </parent> <groupId>org.apache.causeway.examples.apps</groupId> - <artifactId>demo-parent</artifactId> + <artifactId>reference-app-parent</artifactId> - <name>Reference App</name> + <name>Demo - Parent</name> <packaging>pom</packaging> diff --cc testing/pom.xml index a96ccaf,9e69613..025a725 --- a/testing/pom.xml +++ b/testing/pom.xml @@@ -16,8 -16,8 +16,8 @@@ <parent> <groupId>org.apache.causeway.examples.apps</groupId> - <artifactId>demo-parent</artifactId> + <artifactId>reference-app-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --cc web/pom.xml index 982fce8,d59ad77..a3af38d --- a/web/pom.xml +++ b/web/pom.xml @@@ -16,8 -16,8 +16,8 @@@ <parent> <groupId>org.apache.causeway.examples.apps</groupId> - <artifactId>demo-parent</artifactId> + <artifactId>reference-app-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --cc wicket/common/pom.xml index 8be0a68,d1db514..cf7e84b --- a/wicket/common/pom.xml +++ b/wicket/common/pom.xml @@@ -16,8 -16,8 +16,8 @@@ <parent> <groupId>org.apache.causeway.examples.apps</groupId> - <artifactId>demo-parent</artifactId> + <artifactId>reference-app-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --cc wicket/jdo/pom.xml index 86939d1,1551610..8f65ac5 --- a/wicket/jdo/pom.xml +++ b/wicket/jdo/pom.xml @@@ -16,8 -16,8 +16,8 @@@ <parent> <groupId>org.apache.causeway.examples.apps</groupId> - <artifactId>demo-parent</artifactId> + <artifactId>reference-app-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --cc wicket/jpa-and-graphql/pom.xml index ee5576a,bc23299..acb7ff1 --- a/wicket/jpa-and-graphql/pom.xml +++ b/wicket/jpa-and-graphql/pom.xml @@@ -16,8 -16,8 +16,8 @@@ <parent> <groupId>org.apache.causeway.examples.apps</groupId> - <artifactId>demo-parent</artifactId> + <artifactId>reference-app-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@@ -44,7 -44,7 +44,7 @@@ </dependency> <dependency> -- <groupId>org.apache.causeway.incubator.viewer</groupId> ++ <groupId>org.apache.causeway.viewer</groupId> <artifactId>causeway-viewer-graphql-viewer</artifactId> </dependency> diff --cc wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java index b712896,b712896..6f716c5 --- a/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java +++ b/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java @@@ -38,7 -38,7 +38,7 @@@ import org.apache.causeway.valuetypes.m import org.apache.causeway.valuetypes.vega.metamodel.CausewayModuleValVegaMetaModel; import org.apache.causeway.valuetypes.vega.persistence.jpa.CausewayModuleValVegaPersistenceJpa; import org.apache.causeway.valuetypes.vega.ui.wkt.CausewayModuleValVegaUiWkt; --import org.apache.causeway.viewer.graphql.viewer.CausewayModuleIncViewerGraphqlViewer; ++import org.apache.causeway.viewer.graphql.viewer.CausewayModuleViewerGraphqlViewer; import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins; import org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer; @@@ -69,7 -69,7 +69,7 @@@ import demoapp.webapp.wicket.common.Dem CausewayModuleExtPdfjsWicketUi.class, // GraphQL -- CausewayModuleIncViewerGraphqlViewer.class, ++ CausewayModuleViewerGraphqlViewer.class, // Custom Demo UI (Wicket Viewer) DemoAppWicketCommon.class, diff --cc wicket/jpa/pom.xml index f09b66b,b0d1c2e..02a6507 --- a/wicket/jpa/pom.xml +++ b/wicket/jpa/pom.xml @@@ -16,8 -16,8 +16,8 @@@ <parent> <groupId>org.apache.causeway.examples.apps</groupId> - <artifactId>demo-parent</artifactId> + <artifactId>reference-app-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent>
