This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/causeway-app-referenceapp.git
commit 5839f2f06c9a3aba2d13e94f9ad1e7007ef1fa80 Author: danhaywood <[email protected]> AuthorDate: Sun Apr 7 15:30:23 2024 +0100 renames DemoApp -> ReferenceApp --- .editorconfig | 2 +- CREDITS.TXT | 4 +- README.md | 8 +- docker-compose.yml | 2 +- domain-tests/pom.xml | 86 ----------- .../domain/tests/conf/Configuration_usingJdo.java | 52 ------- .../domain/tests/conf/Configuration_usingJpa.java | 52 ------- .../tests/conf/MetaModelExportToConsole.java | 58 -------- .../domain/tests/DomainIntrospectionTestJdo.java | 89 ----------- .../domain/tests/DomainIntrospectionTestJpa.java | 89 ----------- ...{DemoModuleJdo.java => ReferenceModuleJdo.java} | 2 +- ...{DemoModuleJpa.java => ReferenceModuleJpa.java} | 2 +- pom.xml | 14 -- ...ing.java => ReferenceDomainJdo_forTesting.java} | 6 +- ...emoJdoTest.java => SpinUpReferenceJdoTest.java} | 4 +- ...ing.java => ReferenceDomainJpa_forTesting.java} | 8 +- ...emoJpaTest.java => SpinUpReferenceJpaTest.java} | 4 +- ...=> SpinUpReferenceJpaTest.verify.approved.yaml} | 0 ...Common.java => ReferenceAppManifestCommon.java} | 2 +- ...nifestJdo.java => ReferenceAppManifestJdo.java} | 8 +- ...nifestJpa.java => ReferenceAppManifestJpa.java} | 8 +- ...etCommon.java => ReferenceAppWicketCommon.java} | 2 +- wicket/jdo/pom.xml | 4 +- ...ppWicketJdo.java => ReferenceAppWicketJdo.java} | 12 +- wicket/jpa-and-graphql/pom.xml | 165 --------------------- .../webapp/wicket/jpa/DemoAppWicketJpa.java | 113 -------------- .../src/resources/log4j2-spring.xml | 65 -------- .../src/resources/static/index.html | 102 ------------- wicket/jpa/pom.xml | 4 +- ...ppWicketJpa.java => ReferenceAppWicketJpa.java} | 12 +- 30 files changed, 47 insertions(+), 932 deletions(-) diff --git a/.editorconfig b/.editorconfig index f7644a1..551e79c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -112,7 +112,7 @@ ij_java_for_statement_wrap = off ij_java_generate_final_locals = false ij_java_generate_final_parameters = false ij_java_if_brace_force = never -ij_java_imports_layout = java.**,|,$java.**,|,javax.**,|,$javax.**,|,com.**,|,$com.**,|,org.**,|,$org.**,|,org.springframework.**,|,$org.springframework.**,|,org.apache.causeway.**,|,$org.apache.causeway.**,|,lombok.**,lombok.experimental.**,lombok.extern.log4j.**,lombok.extern.**,|,demoapp.**,|,*,|,$* +ij_java_imports_layout = java.**,|,$java.**,|,javax.**,|,$javax.**,|,com.**,|,$com.**,|,org.**,|,$org.**,|,org.springframework.**,|,$org.springframework.**,|,org.apache.causeway.**,|,$org.apache.causeway.**,|,lombok.**,lombok.experimental.**,lombok.extern.log4j.**,lombok.extern.**,|,demoapp.**,|,referenceapp.**,|,*,|,$* ij_java_indent_case_from_switch = true ij_java_insert_inner_class_imports = false ij_java_insert_override_annotation = true diff --git a/CREDITS.TXT b/CREDITS.TXT index 16f50b1..4c8466f 100644 --- a/CREDITS.TXT +++ b/CREDITS.TXT @@ -1,7 +1,7 @@ == Credits == -This Demo App uses icons made by Freepik and Smashicons from www.flaticon.com -which are licensed by CC 3.0 BY. +This Reference App uses icons made by Freepik and Smashicons from www.flaticon.com +which are licensed by CC 3.0 BY. We use AsciidoctorJ [1] for Asciidoc rendering. diff --git a/README.md b/README.md index b024fdc..333e6e3 100644 --- a/README.md +++ b/README.md @@ -11,16 +11,16 @@ The app is available as a Docker image. * to run the JPA variant: ```bash - docker pull apache/causeway-app-demo-jpa:latest - docker run -p 8080:8080 apache/causeway-app-demo-jpa:latest + docker pull apache/causeway-app-referenceapp-jpa:latest + docker run -p 8080:8080 apache/causeway-app-referenceapp-jpa:latest ``` * to run the JDO variant: ```bash - docker pull apache/causeway-app-demo-jdo:latest - docker run -p 8080:8080 apache/causeway-app-demo-jdo:latest + docker pull apache/causeway-app-referenceapp-jdo:latest + docker run -p 8080:8080 apache/causeway-app-referenceapp-jdo:latest ``` ... then navigate to http://localhost:8080 diff --git a/docker-compose.yml b/docker-compose.yml index 55dbec5..b377fe0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,7 @@ version: "3.3" services: primary: - image: "apache/causeway-app-demo-jdo:latest" + image: "apache/causeway-app-referenceapp-jdo:latest" environment: - PROTOTYPING=true - SPRING_PROFILES_ACTIVE=primary diff --git a/domain-tests/pom.xml b/domain-tests/pom.xml deleted file mode 100644 index fd6581c..0000000 --- a/domain-tests/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?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/xsd/maven-4.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> - </parent> - - <artifactId>reference-app-domain-tests</artifactId> - <name>Reference App - Domain Tests</name> - <description>Introduced to allow for JUnit integration tests with the demo-domain.</description> - - <properties> - <!-- <maven.compiler.release>18</maven.compiler.release> --> - </properties> - - <build> - <resources> - <resource> - <filtering>true</filtering> - <directory>src/main/resources</directory> - <includes> - <include>application.yml</include> - </includes> - </resource> - <resource> - <filtering>false</filtering> - <directory>src/main/resources</directory> - </resource> - <resource> - <filtering>false</filtering> - <directory>src/main/java</directory> - <includes> - <!-- we include all .java too, so that we can reference it from the descriptions --> - <include>**</include> - </includes> - </resource> - </resources> - </build> - - <dependencies> - - <!-- DEMO DOMAIN --> - - <dependency> - <groupId>org.apache.causeway.examples.apps</groupId> - <artifactId>reference-app-domain</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.causeway.examples.apps</groupId> - <artifactId>reference-app-web</artifactId> - </dependency> - - <!-- DEMO DOMAIN ADDITIONAL DEPENDENCIES --> - - <dependency> - <groupId>org.apache.causeway.valuetypes</groupId> - <artifactId>causeway-valuetypes-asciidoc-ui</artifactId> - <version>2.0.0-SNAPSHOT</version> - </dependency> - - <!-- provides DomainObjectTesterFactory --> - <dependency> - <groupId>org.apache.causeway.regressiontests</groupId> - <artifactId>causeway-regressiontests-stable</artifactId> - <version>2.0.0-SNAPSHOT</version> - </dependency> - - </dependencies> - -</project> diff --git a/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJdo.java b/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJdo.java deleted file mode 100644 index 4282f0c..0000000 --- a/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJdo.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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. - */ -package demoapp.dom.domain.tests.conf; - -import org.springframework.boot.SpringBootConfiguration; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.Profile; -import org.springframework.context.annotation.PropertySource; -import org.springframework.context.annotation.PropertySources; - -import org.apache.causeway.core.config.presets.CausewayPresets; -import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices; -import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus; -import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib; - -import demoapp.web.DemoAppManifestJdo; - -@SpringBootConfiguration -@EnableAutoConfiguration -@Import({ - CausewayModuleCoreRuntimeServices.class, - CausewayModulePersistenceJdoDatanucleus.class, - CausewayModuleTestingFixturesApplib.class, - - // demo domain - DemoAppManifestJdo.class, -}) -@PropertySources({ - @PropertySource(CausewayPresets.NoTranslations), - @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema), -}) -@Profile("demo-jdo") -public class Configuration_usingJdo { - -} diff --git a/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java b/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java deleted file mode 100644 index 6b25a2b..0000000 --- a/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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. - */ -package demoapp.dom.domain.tests.conf; - -import org.springframework.boot.SpringBootConfiguration; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.Profile; -import org.springframework.context.annotation.PropertySource; -import org.springframework.context.annotation.PropertySources; - -import org.apache.causeway.core.config.presets.CausewayPresets; -import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices; -import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink; -import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib; - -import demoapp.web.DemoAppManifestJpa; - -@SpringBootConfiguration -@EnableAutoConfiguration -@Import({ - CausewayModuleCoreRuntimeServices.class, - CausewayModulePersistenceJpaEclipselink.class, - CausewayModuleTestingFixturesApplib.class, - - // demo domain - DemoAppManifestJpa.class, -}) -@PropertySources({ - @PropertySource(CausewayPresets.NoTranslations), - @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema), -}) -@Profile("demo-jpa") -public class Configuration_usingJpa { - -} diff --git a/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/MetaModelExportToConsole.java b/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/MetaModelExportToConsole.java deleted file mode 100644 index ca04a25..0000000 --- a/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/MetaModelExportToConsole.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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. - */ -package demoapp.dom.domain.tests.conf; - -import org.apache.causeway.applib.services.metamodel.DomainModel; - -import lombok.val; - -public class MetaModelExportToConsole { - - //XXX this is just a blue-print example - (nomnoml syntax) - //idea is to eventually create a SPI to allow for pluging into - //the MM export menu to provide custom export formats - public void export(final DomainModel domainModel) { - - domainModel.forEachLogicalType((logicalType, members)->{ - - //[rum|tastiness: Int|swig()] - val sb = new StringBuilder(); - - sb - .append("[") - .append(logicalType); - - members.forEach(member->{ - - sb - .append("|") - .append(member.getMemberName()) - .append(": ") - .append(member.getType()); - - }); - - sb.append("]"); - - System.err.printf("%s%n", sb.toString()); - }); - - } - -} diff --git a/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java b/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java deleted file mode 100644 index 6c5bebb..0000000 --- a/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * 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. - */ -package demoapp.dom.domain.tests; - -import java.util.stream.Collectors; - -import javax.inject.Inject; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.TestPropertySource; - -import org.apache.causeway.applib.services.metamodel.MetaModelService; -import org.apache.causeway.applib.services.registry.ServiceRegistry; -import org.apache.causeway.core.config.presets.CausewayPresets; -import org.apache.causeway.core.metamodel.specloader.SpecificationLoader; -import org.apache.causeway.testing.integtestsupport.applib.validate.DomainModelValidator; - -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.fail; - -import demoapp.dom.domain.tests.conf.Configuration_usingJdo; -import demoapp.dom.domain.tests.conf.MetaModelExportToConsole; -import lombok.val; - -@SpringBootTest( - classes = { - Configuration_usingJdo.class, - }, - properties = { - "causeway.core.meta-model.introspector.mode=FULL", - //"causeway.core.config.configuration-property-visibility-policy=ALWAYS_SHOW", - "causeway.applib.annotation.domain-object.editing=TRUE", - "causeway.core.meta-model.validator.explicit-object-type=FALSE", // does not override any of the imports - "logging.level.DependentArgUtils=DEBUG" - }) -@TestPropertySource({ - CausewayPresets.SilenceMetaModel, - CausewayPresets.SilenceProgrammingModel -}) -@ActiveProfiles(profiles = "demo-jdo") -class DomainIntrospectionTestJdo { - - @Inject private MetaModelService metaModelService; - //@Inject private JaxbService jaxbService; - @Inject private ServiceRegistry serviceRegistry; - @Inject private SpecificationLoader specificationLoader; - //@Inject private TitleService titleService; - //@Inject private CausewayConfiguration causewayConfig; - //@Inject private DomainObjectTesterFactory testerFactory; - - @Test - void domain_shouldPassValidation() { - - assertFalse(specificationLoader.snapshotSpecifications().isEmpty()); - - val validateDomainModel = new DomainModelValidator(serviceRegistry); - val validationFailures = validateDomainModel.getFailures().stream() - .collect(Collectors.toSet()); - - if(!validationFailures.isEmpty()) { - fail(String.format("%d problems found:\n%s", - validationFailures.size(), - validationFailures.stream() - .map(validationFailure->validationFailure.getMessage()) - .collect(Collectors.joining("\n")))); - } - - new MetaModelExportToConsole().export(metaModelService.getDomainModel()); - } - -} diff --git a/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java b/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java deleted file mode 100644 index 762254f..0000000 --- a/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * 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. - */ -package demoapp.dom.domain.tests; - -import java.util.stream.Collectors; - -import javax.inject.Inject; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.TestPropertySource; - -import org.apache.causeway.applib.services.metamodel.MetaModelService; -import org.apache.causeway.applib.services.registry.ServiceRegistry; -import org.apache.causeway.core.config.presets.CausewayPresets; -import org.apache.causeway.core.metamodel.specloader.SpecificationLoader; -import org.apache.causeway.testing.integtestsupport.applib.validate.DomainModelValidator; - -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.fail; - -import demoapp.dom.domain.tests.conf.Configuration_usingJpa; -import demoapp.dom.domain.tests.conf.MetaModelExportToConsole; -import lombok.val; - -@SpringBootTest( - classes = { - Configuration_usingJpa.class, - }, - properties = { - "causeway.core.meta-model.introspector.mode=FULL", - //"causeway.core.config.configuration-property-visibility-policy=ALWAYS_SHOW", - "causeway.applib.annotation.domain-object.editing=TRUE", - "causeway.core.meta-model.validator.explicit-object-type=FALSE", // does not override any of the imports - "logging.level.DependentArgUtils=DEBUG" - }) -@TestPropertySource({ - CausewayPresets.SilenceMetaModel, - CausewayPresets.SilenceProgrammingModel -}) -@ActiveProfiles(profiles = "demo-jpa") -class DomainIntrospectionTestJpa { - - @Inject private MetaModelService metaModelService; - //@Inject private JaxbService jaxbService; - @Inject private ServiceRegistry serviceRegistry; - @Inject private SpecificationLoader specificationLoader; - //@Inject private TitleService titleService; - //@Inject private CausewayConfiguration causewayConfig; - //@Inject private DomainObjectTesterFactory testerFactory; - - @Test - void domain_shouldPassValidation() { - - assertFalse(specificationLoader.snapshotSpecifications().isEmpty()); - - val validateDomainModel = new DomainModelValidator(serviceRegistry); - val validationFailures = validateDomainModel.getFailures().stream() - .collect(Collectors.toSet()); - - if(!validationFailures.isEmpty()) { - fail(String.format("%d problems found:\n%s", - validationFailures.size(), - validationFailures.stream() - .map(validationFailure->validationFailure.getMessage()) - .collect(Collectors.joining("\n")))); - } - - new MetaModelExportToConsole().export(metaModelService.getDomainModel()); - } - -} diff --git a/domain/src/main/java/demoapp/dom/DemoModuleJdo.java b/domain/src/main/java/demoapp/dom/ReferenceModuleJdo.java similarity index 98% rename from domain/src/main/java/demoapp/dom/DemoModuleJdo.java rename to domain/src/main/java/demoapp/dom/ReferenceModuleJdo.java index d0fba3d..4bb215f 100644 --- a/domain/src/main/java/demoapp/dom/DemoModuleJdo.java +++ b/domain/src/main/java/demoapp/dom/ReferenceModuleJdo.java @@ -38,6 +38,6 @@ import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistence @PropertySources({ @PropertySource(CausewayPresets.DatanucleusAutocreateNoValidate), }) -public class DemoModuleJdo { +public class ReferenceModuleJdo { } diff --git a/domain/src/main/java/demoapp/dom/DemoModuleJpa.java b/domain/src/main/java/demoapp/dom/ReferenceModuleJpa.java similarity index 99% rename from domain/src/main/java/demoapp/dom/DemoModuleJpa.java rename to domain/src/main/java/demoapp/dom/ReferenceModuleJpa.java index 99d73b4..b2e8d53 100644 --- a/domain/src/main/java/demoapp/dom/DemoModuleJpa.java +++ b/domain/src/main/java/demoapp/dom/ReferenceModuleJpa.java @@ -213,6 +213,6 @@ import demoapp.dom.types.primitive.shorts.jpa.PrimitiveShortJpa; NumberConstantJpa.class, }) -public class DemoModuleJpa { +public class ReferenceModuleJpa { } diff --git a/pom.xml b/pom.xml index cfdb011..190c8c9 100644 --- a/pom.xml +++ b/pom.xml @@ -256,20 +256,6 @@ <module>wicket/jdo</module> </modules> </profile> - <profile> - <id>graphql</id> - <activation> - <property> - <name>graphql</name> - </property> - </activation> - <modules> - <module>domain</module> - <module>web</module> - <module>wicket/common</module> - <module>wicket/jpa-and-graphql</module> - </modules> - </profile> <profile> <id>nightly</id> diff --git a/testing/jdo/src/main/java/demoapp/testing/jdo/DemoDomainJdo_forTesting.java b/testing/jdo/src/main/java/demoapp/testing/jdo/ReferenceDomainJdo_forTesting.java similarity index 90% rename from testing/jdo/src/main/java/demoapp/testing/jdo/DemoDomainJdo_forTesting.java rename to testing/jdo/src/main/java/demoapp/testing/jdo/ReferenceDomainJdo_forTesting.java index 490e107..405e599 100644 --- a/testing/jdo/src/main/java/demoapp/testing/jdo/DemoDomainJdo_forTesting.java +++ b/testing/jdo/src/main/java/demoapp/testing/jdo/ReferenceDomainJdo_forTesting.java @@ -23,14 +23,14 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Profile; -import demoapp.web.DemoAppManifestJdo; +import demoapp.web.ReferenceAppManifestJdo; @SpringBootConfiguration @Profile("demo-jdo") @EnableAutoConfiguration @Import({ - DemoAppManifestJdo.class + ReferenceAppManifestJdo.class }) -public class DemoDomainJdo_forTesting { +public class ReferenceDomainJdo_forTesting { } diff --git a/testing/jdo/src/test/java/demoapp/testing/jdo/SpinUpDemoJdoTest.java b/testing/jdo/src/test/java/demoapp/testing/jdo/SpinUpReferenceJdoTest.java similarity index 96% rename from testing/jdo/src/test/java/demoapp/testing/jdo/SpinUpDemoJdoTest.java rename to testing/jdo/src/test/java/demoapp/testing/jdo/SpinUpReferenceJdoTest.java index b89e58b..240d378 100644 --- a/testing/jdo/src/test/java/demoapp/testing/jdo/SpinUpDemoJdoTest.java +++ b/testing/jdo/src/test/java/demoapp/testing/jdo/SpinUpReferenceJdoTest.java @@ -38,12 +38,12 @@ import lombok.val; @SpringBootTest( classes = { - DemoDomainJdo_forTesting.class + ReferenceDomainJdo_forTesting.class }, properties = { }) @ActiveProfiles(profiles = "demo-jdo") -class SpinUpDemoJdoTest { +class SpinUpReferenceJdoTest { @Autowired MetaModelContext mmc; diff --git a/testing/jpa/src/main/java/demoapp/testing/jpa/DemoDomainJpa_forTesting.java b/testing/jpa/src/main/java/demoapp/testing/jpa/ReferenceDomainJpa_forTesting.java similarity index 90% rename from testing/jpa/src/main/java/demoapp/testing/jpa/DemoDomainJpa_forTesting.java rename to testing/jpa/src/main/java/demoapp/testing/jpa/ReferenceDomainJpa_forTesting.java index 1992d7d..7c1afc7 100644 --- a/testing/jpa/src/main/java/demoapp/testing/jpa/DemoDomainJpa_forTesting.java +++ b/testing/jpa/src/main/java/demoapp/testing/jpa/ReferenceDomainJpa_forTesting.java @@ -23,15 +23,15 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Profile; -import demoapp.web.DemoAppManifestJpa; +import demoapp.web.ReferenceAppManifestJpa; @SpringBootConfiguration @Profile("demo-jpa") @EnableAutoConfiguration @Import({ - DemoAppManifestJpa.class + ReferenceAppManifestJpa.class }) -public class DemoDomainJpa_forTesting { - +public class ReferenceDomainJpa_forTesting { + } diff --git a/testing/jpa/src/test/java/demoapp/testing/jpa/SpinUpDemoJpaTest.java b/testing/jpa/src/test/java/demoapp/testing/jpa/SpinUpReferenceJpaTest.java similarity index 96% rename from testing/jpa/src/test/java/demoapp/testing/jpa/SpinUpDemoJpaTest.java rename to testing/jpa/src/test/java/demoapp/testing/jpa/SpinUpReferenceJpaTest.java index a4df7e3..d3efc8b 100644 --- a/testing/jpa/src/test/java/demoapp/testing/jpa/SpinUpDemoJpaTest.java +++ b/testing/jpa/src/test/java/demoapp/testing/jpa/SpinUpReferenceJpaTest.java @@ -37,14 +37,14 @@ import lombok.val; @SpringBootTest( classes = { - DemoDomainJpa_forTesting.class + ReferenceDomainJpa_forTesting.class }, properties = { //"spring.jpa.show-sql=true", //"logging.level.org.springframework.orm.jpa=DEBUG" }) @ActiveProfiles(profiles = "demo-jpa") -class SpinUpDemoJpaTest { +class SpinUpReferenceJpaTest { @Autowired MetaModelContext mmc; diff --git a/testing/jpa/src/test/java/demoapp/testing/jpa/SpinUpDemoJpaTest.verify.approved.yaml b/testing/jpa/src/test/java/demoapp/testing/jpa/SpinUpReferenceJpaTest.verify.approved.yaml similarity index 100% rename from testing/jpa/src/test/java/demoapp/testing/jpa/SpinUpDemoJpaTest.verify.approved.yaml rename to testing/jpa/src/test/java/demoapp/testing/jpa/SpinUpReferenceJpaTest.verify.approved.yaml diff --git a/web/src/main/java/demoapp/web/DemoAppManifestCommon.java b/web/src/main/java/demoapp/web/ReferenceAppManifestCommon.java similarity index 98% rename from web/src/main/java/demoapp/web/DemoAppManifestCommon.java rename to web/src/main/java/demoapp/web/ReferenceAppManifestCommon.java index a3ed9db..062fc67 100644 --- a/web/src/main/java/demoapp/web/DemoAppManifestCommon.java +++ b/web/src/main/java/demoapp/web/ReferenceAppManifestCommon.java @@ -66,7 +66,7 @@ import demoapp.web.security.PrototypeActionsVisibilityAdvisor; }) @Log4j2 -public class DemoAppManifestCommon { +public class ReferenceAppManifestCommon { /** * If available from {@code System.getProperty("ContextPath")} diff --git a/web/src/main/java/demoapp/web/DemoAppManifestJdo.java b/web/src/main/java/demoapp/web/ReferenceAppManifestJdo.java similarity index 93% rename from web/src/main/java/demoapp/web/DemoAppManifestJdo.java rename to web/src/main/java/demoapp/web/ReferenceAppManifestJdo.java index ffd478f..e926dda 100644 --- a/web/src/main/java/demoapp/web/DemoAppManifestJdo.java +++ b/web/src/main/java/demoapp/web/ReferenceAppManifestJdo.java @@ -29,15 +29,15 @@ import org.apache.causeway.extensions.executionoutbox.jdo.CausewayModuleExtExecu import org.apache.causeway.extensions.secman.jdo.CausewayModuleExtSecmanPersistenceJdo; import org.apache.causeway.extensions.sessionlog.jdo.CausewayModuleExtSessionLogPersistenceJdo; -import demoapp.dom.DemoModuleJdo; +import demoapp.dom.ReferenceModuleJdo; /** * Makes the integral parts of the 'demo' web application. */ @Configuration @Import({ - DemoModuleJdo.class, - DemoAppManifestCommon.class, + ReferenceModuleJdo.class, + ReferenceAppManifestCommon.class, // Security Manager Extension (secman) CausewayModuleExtSecmanPersistenceJdo.class, @@ -49,6 +49,6 @@ import demoapp.dom.DemoModuleJdo; }) -public class DemoAppManifestJdo { +public class ReferenceAppManifestJdo { } diff --git a/web/src/main/java/demoapp/web/DemoAppManifestJpa.java b/web/src/main/java/demoapp/web/ReferenceAppManifestJpa.java similarity index 93% rename from web/src/main/java/demoapp/web/DemoAppManifestJpa.java rename to web/src/main/java/demoapp/web/ReferenceAppManifestJpa.java index 2af6217..b8198aa 100644 --- a/web/src/main/java/demoapp/web/DemoAppManifestJpa.java +++ b/web/src/main/java/demoapp/web/ReferenceAppManifestJpa.java @@ -28,15 +28,15 @@ import org.apache.causeway.extensions.executionoutbox.jpa.CausewayModuleExtExecu import org.apache.causeway.extensions.secman.jpa.CausewayModuleExtSecmanPersistenceJpa; import org.apache.causeway.extensions.sessionlog.jpa.CausewayModuleExtSessionLogPersistenceJpa; -import demoapp.dom.DemoModuleJpa; +import demoapp.dom.ReferenceModuleJpa; /** * Makes the integral parts of the 'demo' web application. */ @Configuration @Import({ - DemoModuleJpa.class, - DemoAppManifestCommon.class, + ReferenceModuleJpa.class, + ReferenceAppManifestCommon.class, // Security Manager Extension (secman) CausewayModuleExtSecmanPersistenceJpa.class, @@ -46,6 +46,6 @@ import demoapp.dom.DemoModuleJpa; CausewayModuleExtExecutionOutboxPersistenceJpa.class, CausewayModuleExtAuditTrailPersistenceJpa.class, }) -public class DemoAppManifestJpa { +public class ReferenceAppManifestJpa { } diff --git a/wicket/common/src/main/java/demoapp/webapp/wicket/common/DemoAppWicketCommon.java b/wicket/common/src/main/java/demoapp/webapp/wicket/common/ReferenceAppWicketCommon.java similarity index 97% rename from wicket/common/src/main/java/demoapp/webapp/wicket/common/DemoAppWicketCommon.java rename to wicket/common/src/main/java/demoapp/webapp/wicket/common/ReferenceAppWicketCommon.java index c5e6a3f..c3ddfbc 100644 --- a/wicket/common/src/main/java/demoapp/webapp/wicket/common/DemoAppWicketCommon.java +++ b/wicket/common/src/main/java/demoapp/webapp/wicket/common/ReferenceAppWicketCommon.java @@ -35,6 +35,6 @@ import demoapp.webapp.wicket.common.featured.customui.WhereInTheWorldPanelFactor CausewayModuleExtFullCalendarWicketUi.class, CausewayModuleExtTabularExcel.class, // allows for collection download as excel }) -public class DemoAppWicketCommon { +public class ReferenceAppWicketCommon { } diff --git a/wicket/jdo/pom.xml b/wicket/jdo/pom.xml index 1551610..f7130d5 100644 --- a/wicket/jdo/pom.xml +++ b/wicket/jdo/pom.xml @@ -133,13 +133,13 @@ <jvmFlags> <jvmFlag>-Xmx512m</jvmFlag> </jvmFlags> - <mainClass>demoapp.webapp.wicket.jdo.DemoAppWicketJdo</mainClass> + <mainClass>demoapp.webapp.wicket.jdo.ReferenceAppWicketJdo</mainClass> <ports> <port>8080</port> </ports> </container> <to> - <image>docker.io/apache/causeway-app-demo-jdo</image> + <image>docker.io/apache/causeway-app-reference-jdo</image> <tags> <tag>${env.REVISION}</tag> </tags> diff --git a/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java b/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/ReferenceAppWicketJdo.java similarity index 92% rename from wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java rename to wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/ReferenceAppWicketJdo.java index 304c748..b806ed2 100644 --- a/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java +++ b/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/ReferenceAppWicketJdo.java @@ -41,8 +41,8 @@ import org.apache.causeway.valuetypes.vega.ui.wkt.CausewayModuleValVegaUiWkt; import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins; import org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer; -import demoapp.web.DemoAppManifestJdo; -import demoapp.webapp.wicket.common.DemoAppWicketCommon; +import demoapp.web.ReferenceAppManifestJdo; +import demoapp.webapp.wicket.common.ReferenceAppWicketCommon; /** * Bootstrap the application. @@ -50,7 +50,7 @@ import demoapp.webapp.wicket.common.DemoAppWicketCommon; @SpringBootApplication @Import({ // App-Manifest (Configuration) - DemoAppManifestJdo.class, + ReferenceAppManifestJdo.class, // Metamodel CausewayModuleValAsciidocMetaModel.class, @@ -67,7 +67,7 @@ import demoapp.webapp.wicket.common.DemoAppWicketCommon; CausewayModuleExtPdfjsWicketUi.class, // Custom Demo UI (Wicket Viewer) - DemoAppWicketCommon.class, + ReferenceAppWicketCommon.class, // Persistence (JDO/DN5) CausewayModuleValAsciidocPersistenceJdo.class, @@ -78,7 +78,7 @@ import demoapp.webapp.wicket.common.DemoAppWicketCommon; //WicketViewerXrayEnable.class // for debugging only }) //@Log4j2 -public class DemoAppWicketJdo extends SpringBootServletInitializer { +public class ReferenceAppWicketJdo extends SpringBootServletInitializer { /** * @@ -99,7 +99,7 @@ public class DemoAppWicketJdo extends SpringBootServletInitializer { CausewayModuleExtCommandLogApplib.honorSystemEnvironment(); - SpringApplication.run(new Class[] { DemoAppWicketJdo.class }, args); + SpringApplication.run(new Class[] { ReferenceAppWicketJdo.class }, args); } diff --git a/wicket/jpa-and-graphql/pom.xml b/wicket/jpa-and-graphql/pom.xml deleted file mode 100644 index bc23299..0000000 --- a/wicket/jpa-and-graphql/pom.xml +++ /dev/null @@ -1,165 +0,0 @@ -<?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/xsd/maven-4.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> - <relativePath>../../pom.xml</relativePath> - </parent> - - <artifactId>reference-app-wicket-jpa-and-graphql</artifactId> - - <name>Reference App - Wicket/JPA (with GraphQL)</name> - - <packaging>jar</packaging> - - <properties> - <maven.deploy.skip>true</maven.deploy.skip> - <sonar.skip>true</sonar.skip> - <spring.profiles.active>demo-jpa</spring.profiles.active> - </properties> - - - <dependencies> - - <!-- DEMO DOMAIN + WEB --> - - <dependency> - <groupId>org.apache.causeway.examples.apps</groupId> - <artifactId>reference-app-wicket-common</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.causeway.incubator.viewer</groupId> - <artifactId>causeway-viewer-graphql-viewer</artifactId> - </dependency> - - <!-- PERSISTENCE --> - - <dependency> - <groupId>org.apache.causeway.persistence</groupId> - <artifactId>causeway-persistence-jpa-eclipselink</artifactId> - </dependency> - - </dependencies> - - <profiles> - - <!-- running: mvn spring-boot:run --> - <profile> - <id>package-as-jar</id> - <activation> - <property> - <name>!skip-package-as-jar</name> - </property> - </activation> - <properties> - <packaging.type>jar</packaging.type> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <configuration> - <requiresUnpack> - <dependency> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctorj</artifactId> - </dependency> - </requiresUnpack> - <excludes> - <exclude> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-configuration-processor</artifactId> - </exclude> - </excludes> - </configuration> - <executions> - <execution> - <id>build-info</id> - <goals> - <goal>build-info</goal> - </goals> - <configuration> - <additionalProperties> - <java.version>${java.version}</java.version> - <description>${project.description}</description> - </additionalProperties> - </configuration> - </execution> - <execution> - <goals> - <goal>repackage</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - - <profile> - <id>deploy-to-docker-io</id> - <activation> - <property> - <name>!skip-docker</name> - </property> - </activation> - <properties> - </properties> - <dependencies> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>com.google.cloud.tools</groupId> - <artifactId>jib-maven-plugin</artifactId> - <configuration> - <from> - <image>openjdk:18-jdk-slim-bullseye</image> - </from> - <container> - <jvmFlags> - <jvmFlag>-Xmx512m</jvmFlag> - </jvmFlags> - <mainClass>demoapp.webapp.wicket.jpa.DemoAppWicketJpa</mainClass> - <ports> - <port>8080</port> - </ports> - </container> - <to> - <image>docker.io/apacheisis/demo-wicket-jpa-and-graphql</image> - <tags> - <tag>${env.REVISION}</tag> - </tags> - <auth> - <username>${env.DOCKER_REGISTRY_USERNAME}</username> - <password>${env.DOCKER_REGISTRY_PASSWORD}</password> - </auth> - </to> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - </profiles> - -</project> diff --git 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 deleted file mode 100644 index b712896..0000000 --- a/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * 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. - */ -package demoapp.webapp.wicket.jpa; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.context.annotation.Import; - -import org.apache.causeway.commons.internal.os._OsUtil; -import org.apache.causeway.core.config.presets.CausewayPresets; -import org.apache.causeway.core.config.util.SpringProfileUtil; -import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib; -import org.apache.causeway.extensions.pdfjs.wkt.ui.CausewayModuleExtPdfjsWicketUi; -import org.apache.causeway.extensions.sse.wicket.CausewayModuleExtSseWicket; -import org.apache.causeway.valuetypes.asciidoc.metamodel.CausewayModuleValAsciidocMetaModel; -import org.apache.causeway.valuetypes.asciidoc.persistence.jpa.CausewayModuleValAsciidocPersistenceJpa; -import org.apache.causeway.valuetypes.asciidoc.ui.wkt.CausewayModuleValAsciidocUiWkt; -import org.apache.causeway.valuetypes.markdown.metamodel.CausewayModuleValMarkdownMetaModel; -import org.apache.causeway.valuetypes.markdown.persistence.jpa.CausewayModuleValMarkdownPersistenceJpa; -import org.apache.causeway.valuetypes.markdown.ui.wkt.CausewayModuleValMarkdownUiWkt; -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.wicket.applib.CausewayModuleViewerWicketApplibMixins; -import org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer; - -import demoapp.web.DemoAppManifestJpa; -import demoapp.webapp.wicket.common.DemoAppWicketCommon; - -/** - * Bootstrap the application. - */ -@SpringBootApplication -@Import({ - // App-Manifest (Configuration) - DemoAppManifestJpa.class, - //CausewayModuleSecurityBypass.class, // <-- bypass authentication - - // Metamodel - CausewayModuleValAsciidocMetaModel.class, - CausewayModuleValMarkdownMetaModel.class, - CausewayModuleValVegaMetaModel.class, - - // UI (Wicket Viewer) - CausewayModuleViewerWicketViewer.class, - CausewayModuleViewerWicketApplibMixins.class, - CausewayModuleExtSseWicket.class, - CausewayModuleValAsciidocUiWkt.class, - CausewayModuleValMarkdownUiWkt.class, - CausewayModuleValVegaUiWkt.class, - CausewayModuleExtPdfjsWicketUi.class, - - // GraphQL - CausewayModuleIncViewerGraphqlViewer.class, - - // Custom Demo UI (Wicket Viewer) - DemoAppWicketCommon.class, - - // Persistence/Converters (JPA) - CausewayModuleValAsciidocPersistenceJpa.class, - CausewayModuleValMarkdownPersistenceJpa.class, - CausewayModuleValVegaPersistenceJpa.class, - - //XrayEnable.class // for debugging only -}) -//@Log4j2 -public class DemoAppWicketJpa extends SpringBootServletInitializer { - - /** - * - * @param args - * @implNote this is to support the <em>Spring Boot Maven Plugin</em>, which auto-detects an - * entry point by searching for classes having a {@code main(...)} - */ - public static void main(final String[] args) { - - // activates when sys-env THERE_CAN_BE_ONLY_ONE=true - _OsUtil.thereCanBeOnlyOne(); - - CausewayPresets.prototyping(); - //CausewayPresets.logging(WebRequestCycleForCauseway.class, "debug"); - //CausewayPresets.logging(ComponentFactoryRegistryDefault.class, "debug"); - //CausewayPresets.logging(EntityModel.class, "debug"); - //CausewayPresets.logging(FormExecutorDefault.class, "debug"); - - SpringProfileUtil.removeActiveProfile("demo-jdo"); // just in case - SpringProfileUtil.addActiveProfile("demo-jpa"); - - CausewayModuleExtCommandLogApplib.honorSystemEnvironment(); - - SpringApplication.run(new Class[] { DemoAppWicketJpa.class }, args); - - } - -} diff --git a/wicket/jpa-and-graphql/src/resources/log4j2-spring.xml b/wicket/jpa-and-graphql/src/resources/log4j2-spring.xml deleted file mode 100644 index e2e9c9e..0000000 --- a/wicket/jpa-and-graphql/src/resources/log4j2-spring.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?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. ---> -<Configuration status="WARN"> - <Properties> - <Property name="PID">????</Property> - <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property> - <Property name="LOG_LEVEL_PATTERN">%5p</Property> - <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property> - <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property> - <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property> - </Properties> - <Appenders> - <Console name="Console" target="SYSTEM_OUT" follow="true"> - <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" /> - </Console> - </Appenders> - <Loggers> - - <!-- silence Wicket --> - <Logger name="org.apache.wicket.page.PartialPageUpdate" level="error" /> - - <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" /> - <Logger name="org.apache.catalina.util.LifecycleBase" level="error" /> - <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" /> - <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/> - <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" /> - <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" /> - <Logger name="org.hibernate.validator.internal.util.Version" level="warn" /> - <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/> - - <logger name="org.apache.directory" level="warn"/> - <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/> - - <logger name="DataNucleus.Persistence" level="info"/> - <logger name="DataNucleus.Transaction" level="info"/> - <logger name="DataNucleus.Datastore.Schema" level="info"/> - <logger name="DataNucleus.Datastore.Native" level="info"/> - - - <!-- debugging --> - <Logger name="org.apache.causeway.applib.services.command.CommandServiceDefault" level="warn" /> - <Logger name="org.apache.causeway.extensions.commandreplay.secondary.jobcallables.ReplicateAndRunCommands" level="debug" /> - - <Root level="info"> - <AppenderRef ref="Console" /> - </Root> - </Loggers> -</Configuration> diff --git a/wicket/jpa-and-graphql/src/resources/static/index.html b/wicket/jpa-and-graphql/src/resources/static/index.html deleted file mode 100644 index 7ea10e2..0000000 --- a/wicket/jpa-and-graphql/src/resources/static/index.html +++ /dev/null @@ -1,102 +0,0 @@ -<!-- - ~ 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. - ~ - --> - -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - <title>Apache Causeway™ Demo App</title> - - <link rel="stylesheet" type="text/css" href="css/page.css"> - </head> - <body> - <div id="wrapper"> - <img alt="Causeway Logo" src="images/apache-causeway/logo.png" /> - - <p> - This demo app illustrates some features of the Apache Causeway' programming model. - <br/> - </p> - - <p>To access the app:</p> - <ul> - <li> - <p> - <b><a href="wicket/">Generic UI (Wicket)</a></b> - </p> - <p> - provides access to a generic UI for end-users, Apache Causeway' - <a href="https://causeway.apache.org/guides/ugvw/ugvw.html"; target="_blank">Wicket Viewer</a>. - As its name suggests, this viewer is built on top of - <a href="https://wicket.apache.org"; target="_blank">Apache Wicket</a>™. - </p> - </li> - <li> - <p> - <b> - <a href="swagger-ui/index.thtml">RESTful API (Swagger)</a> - </b> - </p> - <p> - provides access to a Swagger UI for convenient access to a subset of the framework's RESTful - API, automatically generated by the - <a href="https://causeway.apache.org/guides/ugvro/ugvro.html"; - target="_blank">Restful Objects viewer</a>. - </p> - <p> - The full backend API (at <a href="restful/">restful/</a>) renders both simple and also richer - hypermedia representations of domain objects, the latter conform with the - <a href="http://restfulobjects.org"; target="_blank">Restful Objects</a> spec. - </p> - </li> - <!-- - <li> - <p> - <b><a href="kroviz/index.html">Kroviz (INCUBATING)</a></b> - </p> - <p> - provides access to a generic UI client for end-users, leveraging the REST API provided by the - <a href="https://causeway.apache.org/guides/ugvro/ugvro.html"; target="_blank">Restful Objects viewer</a>. - This viewer is written in Kotlin/JS and built on top of - <a href="https://kvision.gitbook.io/kvision-guide/"; target="_blank">KVision</a>™. - This viewer is still in the Apache Causeway Incubator - use at your own risk and please report bugs. - </p> - </li> - --> - <li> - <p> - <b> - <a href="graphiql">GraphIQL (INCUBATING)</a> - </b> - </p> - <p> - provides a console to access the GraphQL viewer. - This viewer is still in the Apache Causeway Incubator - use at your own risk and please report bugs. - </p> - </li> - </ul> - - <p> - The default user/password is <b><i>sven/pass</i></b>. - </p> - - </div> - </body> -</html> diff --git a/wicket/jpa/pom.xml b/wicket/jpa/pom.xml index b0d1c2e..49f24ef 100644 --- a/wicket/jpa/pom.xml +++ b/wicket/jpa/pom.xml @@ -133,13 +133,13 @@ <jvmFlags> <jvmFlag>-Xmx512m</jvmFlag> </jvmFlags> - <mainClass>demoapp.webapp.wicket.jpa.DemoAppWicketJpa</mainClass> + <mainClass>demoapp.webapp.wicket.jpa.ReferenceAppWicketJpa</mainClass> <ports> <port>8080</port> </ports> </container> <to> - <image>docker.io/apache/causeway-app-demo-jpa</image> + <image>docker.io/apache/causeway-app-referenceapp-jpa</image> <tags> <tag>${env.REVISION}</tag> </tags> diff --git a/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java b/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/ReferenceAppWicketJpa.java similarity index 93% rename from wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java rename to wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/ReferenceAppWicketJpa.java index 0cd0934..4d8ca36 100644 --- a/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java +++ b/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/ReferenceAppWicketJpa.java @@ -41,8 +41,8 @@ import org.apache.causeway.valuetypes.vega.ui.wkt.CausewayModuleValVegaUiWkt; import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins; import org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer; -import demoapp.web.DemoAppManifestJpa; -import demoapp.webapp.wicket.common.DemoAppWicketCommon; +import demoapp.web.ReferenceAppManifestJpa; +import demoapp.webapp.wicket.common.ReferenceAppWicketCommon; /** * Bootstrap the application. @@ -50,7 +50,7 @@ import demoapp.webapp.wicket.common.DemoAppWicketCommon; @SpringBootApplication @Import({ // App-Manifest (Configuration) - DemoAppManifestJpa.class, + ReferenceAppManifestJpa.class, //CausewayModuleSecurityBypass.class, // <-- bypass authentication // Metamodel @@ -68,7 +68,7 @@ import demoapp.webapp.wicket.common.DemoAppWicketCommon; CausewayModuleExtPdfjsWicketUi.class, // Custom Demo UI (Wicket Viewer) - DemoAppWicketCommon.class, + ReferenceAppWicketCommon.class, // Persistence/Converters (JPA) CausewayModuleValAsciidocPersistenceJpa.class, @@ -79,7 +79,7 @@ import demoapp.webapp.wicket.common.DemoAppWicketCommon; // WicketViewerXrayEnable.class // for debugging only }) //@Log4j2 -public class DemoAppWicketJpa extends SpringBootServletInitializer { +public class ReferenceAppWicketJpa extends SpringBootServletInitializer { /** * @@ -104,7 +104,7 @@ public class DemoAppWicketJpa extends SpringBootServletInitializer { CausewayModuleExtCommandLogApplib.honorSystemEnvironment(); - SpringApplication.run(new Class[] { DemoAppWicketJpa.class }, args); + SpringApplication.run(new Class[] { ReferenceAppWicketJpa.class }, args); }
