You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/02 23:02:16 UTC
[isis-app-simpleapp] 08/09: cleans up the two lockdown tests/integ
tests. Removes ASF license statements.
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/isis-app-simpleapp.git
commit 2051730df559fc0f686d0735c32e6af2f323c25f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Dec 2 17:08:22 2019 +0000
cleans up the two lockdown tests/integ tests. Removes ASF license statements.
---
.gitlab-ci.yml | 51 ------
.m2/settings.xml | 15 --
LICENSE | 201 +++++++++++++++++++++
README.adoc | 130 +++++++------
module-simple/logging-dn-enhance.properties | 17 --
module-simple/pom.xml | 10 -
.../src/main/java/META-INF/persistence.xml | 18 --
.../domainapp/modules/simple/SimpleModule.java | 18 --
.../modules/simple/dom/impl/SimpleObject.java | 18 --
.../simple/dom/impl/SimpleObject.layout.xml | 18 --
.../modules/simple/dom/impl/SimpleObjects.java | 18 --
.../domainapp/modules/simple/dom/types/Name.java | 18 --
.../domainapp/modules/simple/dom/types/Notes.java | 18 --
.../simple/fixture/SimpleObjectBuilder.java | 19 --
.../simple/fixture/SimpleObject_persona.java | 19 --
.../modules/simple/dom/impl/SimpleObject_Test.java | 16 --
.../simple/dom/impl/SimpleObjects_Test.java | 16 --
.../integtests/SimpleModuleIntegTestAbstract.java | 18 --
.../integtests/tests/SimpleObject_IntegTest.java | 18 --
.../integtests/tests/SimpleObjects_IntegTest.java | 18 --
pom.xml | 18 --
webapp/lib/.gitignore | 0
webapp/pom.xml | 91 +++-------
.../src/main/java/domainapp/webapp/SimpleApp.java | 18 --
.../webapp/application/ApplicationModule.java | 18 --
...mainAppFixtureScriptsSpecificationProvider.java | 18 --
.../fixture/scenarios/DomainAppDemo.java | 18 --
.../webapp/application/layout/menubars.layout.xml | 18 --
.../services/health/HealthCheckServiceImpl.java | 18 --
.../services/homepage/HomePageService.java | 18 --
.../services/homepage/HomePageViewModel.java | 18 --
.../services/homepage/HomePageViewModel.layout.xml | 18 --
webapp/src/main/resources/shiro.ini | 18 --
.../src/main/resources/static/css/application.css | 19 --
webapp/src/main/resources/static/index.html | 18 --
webapp/src/main/webapp/WEB-INF/web.xml | 18 --
.../domainapp/webapp/bdd/RunIntegBddSpecs.java | 16 --
.../webapp/bdd/glue/SimpleObjectsStepDef.java | 19 +-
.../SimpleObjectSpec_listAllAndCreate.feature | 16 --
.../integtests/ApplicationIntegTestAbstract.java | 18 --
.../metamodel/ValidateDomainModel_IntegTest.java | 22 +++
.../lockdown/LockDownMetaModel_IntegTest.java} | 65 ++-----
...ainapp.modules.simple.dom.impl.SimpleObject.xml | 103 ++++++++++-
...inapp.modules.simple.dom.impl.SimpleObjects.xml | 154 +++-------------
...mainAppFixtureScriptsSpecificationProvider.xml} | 10 +-
...ion.services.health.HealthCheckServiceImpl.xml} | 10 +-
...cation.services.homepage.HomePageViewModel.xml} | 84 +++++++--
.../lockdown}/received/.gitignore | 0
.../integtests/mml/DomainModel_IntegTest.java | 41 -----
.../webapp/integtests/smoke/Smoke_IntegTest.java | 18 --
.../webapp/lockdown/LockDownMavenDeps_Test.java | 50 -----
.../mavendeps/lockdown/LockDownMavenDeps_Test.java | 71 ++++++++
.../approved/LockDownMavenDeps_Test.list.txt} | 0
.../approved/LockDownMavenDeps_Test.tree.txt} | 24 +--
.../mavendeps}/lockdown/received/.gitignore | 0
.../util/ReceivedVsApprovedApprovalTextWriter.java | 35 ++++
56 files changed, 670 insertions(+), 1104 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 7d4a33b..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# requires the following gitlab secret variables
-# - DOCKER_REGISTRY_USERNAME
-# - DOCKER_REGISTRY_PASSWORD
-# - DOCKER_REGISTRY_EMAIL
-# - DOCKER_REGISTRY_NAME # eg "registry-1.docker.io" (for docker hub)
- # or "docker-dev.incode.cloud" (eg a cloud-based nexus)
-# - DOCKER_REGISTRY_URL # eg "https://index.docker.io/v1/" (for docker hub)
- # or "https://repo.incode.cloud/repository/docker-dev/" (eg a cloud-based nexus)
-#
-
-image: maven:3.5.3-jdk-8
-
-before_script:
- - export REVISION=$(date +%Y%m%d.%H%M).$CI_COMMIT_REF_SLUG.$(echo $CI_COMMIT_SHA | cut -c1-8)
-
-services:
- - docker:dind
-
-variables:
- DOCKER_HOST: tcp://docker:2375
- DOCKER_DRIVER: overlay2
- MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dskip.cloudbees-estatio-repositories -Dskip.sonatype-snapshots -Dskip.apache-snapshots"
- APP_NAME: "simpleapp"
-
-stages:
- - build-package-push
-
-build-package-push:
- stage: build-package-push
- script:
- - echo "REVISION=$REVISION"
- - >
- mvn --batch-mode \
- install \
- -Drevision=$REVISION \
- -Dmavenmixin-docker \
- -Ddocker-plugin.imageName=$DOCKER_REGISTRY_NAME/$DOCKER_REGISTRY_USERNAME/$APP_NAME
- - >
- mvn -s .m2/settings.xml \
- --batch-mode \
- docker:push@push-image-tagged \
- -pl webapp \
- -Drevision=$REVISION \
- -DskipTests \
- -Dskip.isis-swagger \
- -Dmavenmixin-docker \
- -Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY \
- -Ddocker-plugin.serverId=docker-registry \
- -Ddocker.registryUrl=$DOCKER_REGISTRY_URL
-
diff --git a/.m2/settings.xml b/.m2/settings.xml
deleted file mode 100644
index 6038b0e..0000000
--- a/.m2/settings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
- <servers>
- <server>
- <id>docker-registry</id>
- <username>${env.DOCKER_REGISTRY_USERNAME}</username>
- <password>${env.DOCKER_REGISTRY_PASSWORD}</password>
- <configuration>
- <email>${env.DOCKER_REGISTRY_EMAIL}</email>
- </configuration>
- </server>
- </servers>
-</settings>
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e6e77b0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
diff --git a/README.adoc b/README.adoc
index 79c242a..1d27310 100644
--- a/README.adoc
+++ b/README.adoc
@@ -25,7 +25,7 @@ Login using:
* username: `sven`
* password: `pass`
-The app runs with HSQLDB running in-memory, with sample data set up using link:https://isis.apache.org/guides/ugtst.html#_ugtst_fixture-scripts[fixture scripts].
+The app runs with H2 running in-memory, with sample data set up using link:https://isis.apache.org/guides/ugtst.html#_ugtst_fixture-scripts[fixture scripts].
@@ -33,18 +33,14 @@ The app runs with HSQLDB running in-memory, with sample data set up using link:h
The following table explains the contents of each of the directories:
-[width="100%",options="header,footer", cols="2a,4a"]
+[width="100%",options="header,footer",stripes="none",cols="2a,4a"]
|====================
|Directory
|Description
-|`application`
-|Defines application-level classes such as menus and the ``AppManifest`` (which defines the modules that make up the application).
-It also holds application-wide integration tests/BDD specs.
-
|`module-simple`
-|Holds the "simple" module, consisting of the `SimpleObject` entity and supporting repository, along with module-specific unit- and integration tests.
-Also runs `isis:validate` goal for the domain objects within the module. +
+|Holds the "simple" module, consisting of the `SimpleObject` entity and supporting services.
+It also contains module-specific unit- and integration tests.
[TIP]
====
@@ -52,52 +48,63 @@ Larger applications should consist of multiple modules; each such module can be
====
|`webapp`
-|Assembles the application into a webapp (comprising both the Wicket viewer and Restful Objects viewer) and also as a docker image, and runs the `isis:swagger` goal.
+|Holds the bootstrapping classes, along with application-level scoped services and home page.
+It also contains application-wide integration tests/BDD specs, and lockdown tests.
+The `pom.xml` also provides goals to run the app from the command line, or to be assembled into a Docker image.
|====================
-== More advanced use cases
-* To enhance all JDO entities prior to running: +
-+
+== In Development
+
+Apache Isis uses DataNucleus as its ORM, which requires that any entities are "enhanced", a post-compile process.
+
+Normally this is done as part of a "mvn clean install", but the entities can also be enhanced explicity using:
+
[source,bash]
----
mvn -pl module-simple datanucleus:enhance -o
----
+This is useful to know if the application or integration test fails to bootstrap, complaining of "unenhanced entities".
+
+TIP: You can also use `enhance-all.sh`
+
+
+== Testing
+
+To disable the running of unit tests: +
-* To disable the running of unit tests: +
-+
[source,bash]
----
mvn -DskipUTs
----
-+
+
[TIP]
====
By default, output of unit tests are in `target/surefire-unittest-reports` (in the ``module-simple`` modules).
====
-* To disable the running of integration tests: +
-+
+To disable the running of integration tests: +
+
[source,bash]
----
mvn -DskipITs
----
-+
+
[TIP]
====
By default, output of integration tests are in `target/surefire-integtest-reports` (in the ``application`` and ``module-simple`` modules).
====
-* To disable the running of BDD specs: +
-+
+To disable the running of BDD specs: +
+
[source,bash]
----
mvn -DskipBSs
----
-+
+
[TIP]
====
By default, output of integration tests are in `target/surefire-integbddspecs-reports` (in the ``application`` module).
@@ -110,40 +117,49 @@ By default, output of integration tests are in `target/surefire-integbddspecs-r
mvn -DskipTests
----
-//* To package up the application as a docker image (specifying the docker image name as a system property): +
-//+
-//[source,bash]
-//----
-//mvn install -Dmavenmixin-docker -Ddocker-plugin.imageName=mycompany/myapp
-//----
-//+
-//Alternatively, define the `${docker-plugin.imageName}` in the `webapp` module and use simply: +
-//+
-//[source,bash]
-//----
-//mvn install -Dmavenmixin-docker
-//----
-//+
-//The packaged image can be viewed using `docker images`.
-//
-//* To run a docker image previously packaged: +
-//+
-//[source,bash]
-//----
-//docker container run -d -p 8080:8080 mycompany/myapp
-//----
-//+
-//This can then be accessed at link:http://localhost:8080[localhost:8080].
-//+
-//See link:https://github.com/danhaywood/java-mavenmixin-docker#how-to-consume[mavenmixin-docker] for further details on how to run docker images.
-//
-//* To upload the application as a docker image to link:https://hub.docker.com[docker hub] (or some other docker registry): +
-//+
-//[source,bash]
-//----
-//mvn -pl webapp deploy -Dmavenmixin-docker
-//----
-//+
-//This assumes that the `${docker-plugin.imageName}` property has been defined, _and_ also that docker registry credentials have been specified in `~/.m2/settings.xml`.
-//Once more, see link:https://github.com/danhaywood/java-mavenmixin-docker#how-to-configure[mavenmixin-docker] for further details.
+== Docker
+
+To package up the application as a docker image and push to a Docker registry:
+
+* set `$DOCKER_REGISTRY_USERNAME` and `$DOCKER_REGISTRY_PASSWORD` environment variables
+
+* modify the `to/image` configuration property for the link:https://github.com/GoogleContainerTools/jib[jib-maven-plugin] in the `pom.xml`
++
+The default value is `docker.io/apacheisis/simpleapp:latest`:
+
+** change `docker.io` prefix to push to a registry other than Docker hub
+** change `apacheisis/simpleapp` to the name of your app.
+
+* package up the app with the `docker` profile:
++
+[source,bash]
+----
+mvn -pl webapp -DskipTests -Ddocker package
+----
+
+Variants:
+
+* to specify Docker registry credentials through some other mechanism, configure the `pom.xml` for `maven-jib-plugin` (it supports a link:https://github.com/GoogleContainerTools/jib/tree/master/jib-maven-plugin#authentication-methods[variety of ways] to specify credentials)
+
+* to override the image at the command line, use `-Dimage=...`.
+
+
+
+To run a docker image previously packaged:
+
+[source,bash]
+----
+docker pull apacheisis/simpleapp:latest
+docker container run -d -p 8080:8080 apacheisis/simpleapp:latest
+----
+
+This can then be accessed at link:http://localhost:8080[localhost:8080].
+
+
+== Externalized Configuration
+
+The application is configured to run in the `/run/secrets` directory.
+Configuration can be therefore be externalized by defining an `application.properties` secret for the Kubernetes or Docker Swarm cluster.
+
+Spring Boot will use these settings in preference to the configuration properties defined in `classpath:config/application.properties`, see link:https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-external-config[Spring docs].
diff --git a/module-simple/logging-dn-enhance.properties b/module-simple/logging-dn-enhance.properties
index ca165ac..281bfb6 100644
--- a/module-simple/logging-dn-enhance.properties
+++ b/module-simple/logging-dn-enhance.properties
@@ -1,20 +1,3 @@
-# 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.
-
# LOG4J Configuration
# ===================
diff --git a/module-simple/pom.xml b/module-simple/pom.xml
index fbc8a88..eccb360 100644
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@ -1,14 +1,4 @@
<?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">
diff --git a/module-simple/src/main/java/META-INF/persistence.xml b/module-simple/src/main/java/META-INF/persistence.xml
index 8824aa1..dcd7ec0 100644
--- a/module-simple/src/main/java/META-INF/persistence.xml
+++ b/module-simple/src/main/java/META-INF/persistence.xml
@@ -1,22 +1,4 @@
<?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.
--->
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
diff --git a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index a2c757e..8315be4 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.modules.simple;
import org.springframework.context.annotation.ComponentScan;
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java b/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
index 58254b9..4da7a9f 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.modules.simple.dom.impl;
import java.util.Comparator;
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml b/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
index 7b5442c..b3e841f 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
@@ -1,22 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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.
--->
<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:c="http://isis.apache.org/applib/layout/component" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java b/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
index 6b3cbb9..1db1890 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.modules.simple.dom.impl;
import java.util.List;
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/types/Name.java b/module-simple/src/main/java/domainapp/modules/simple/dom/types/Name.java
index 9cd2b22..ebf9531 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/types/Name.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/types/Name.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.modules.simple.dom.types;
import java.lang.annotation.ElementType;
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/types/Notes.java b/module-simple/src/main/java/domainapp/modules/simple/dom/types/Notes.java
index d5fb397..bb35237 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/types/Notes.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/types/Notes.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.modules.simple.dom.types;
import java.lang.annotation.ElementType;
diff --git a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java b/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
index 7f1ee24..9a0e02a 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
@@ -1,22 +1,3 @@
-/*
- * 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 domainapp.modules.simple.fixture;
import javax.inject.Inject;
diff --git a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java b/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
index 19c378b..f817ea8 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
@@ -1,22 +1,3 @@
-/*
- * 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 domainapp.modules.simple.fixture;
import org.apache.isis.applib.services.registry.ServiceRegistry;
diff --git a/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java b/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java
index 8ad7b15..ab6be96 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java
@@ -1,19 +1,3 @@
-/**
- * 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 domainapp.modules.simple.dom.impl;
diff --git a/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjects_Test.java b/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjects_Test.java
index 732d0e9..f06ee67 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjects_Test.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjects_Test.java
@@ -1,19 +1,3 @@
-/**
- * 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 domainapp.modules.simple.dom.impl;
import java.util.List;
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index 65334a1..2e1b410 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.modules.simple.integtests;
import domainapp.modules.simple.SimpleModule;
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
index 7901c41..f2362f0 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.modules.simple.integtests.tests;
import java.sql.Timestamp;
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
index 1769414..32dddf0 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.modules.simple.integtests.tests;
import java.sql.SQLIntegrityConstraintViolationException;
diff --git a/pom.xml b/pom.xml
index 4740549..42a1271 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,22 +1,4 @@
<?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>
diff --git a/webapp/lib/.gitignore b/webapp/lib/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/webapp/pom.xml b/webapp/pom.xml
index e95c743..33f4524 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -1,22 +1,4 @@
<?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>
@@ -88,6 +70,19 @@
</execution>
</executions>
</plugin>
+ <!-- running: mvn spring-boot:run -->
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -112,6 +107,11 @@
</dependency>
<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
@@ -135,48 +135,6 @@
<profiles>
<profile>
- <id>actuator</id>
- <activation>
- <property>
- <name>!skip.actuator</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-actuator-autoconfigure</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <!-- running: mvn spring-boot:run -->
- <profile>
- <id>package-as-jar</id>
- <activation>
- <property>
- <name>!skip.package-as-jar</name>
- </property>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring-boot.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>lockdown</id>
<activation>
<property>
@@ -195,7 +153,7 @@
<goal>list</goal>
</goals>
<configuration>
- <outputFile>${project.build.directory}/test-classes/domainapp/webapp/lockdown/LockDownMavenDeps_Test.list.actual.txt</outputFile>
+ <outputFile>${project.build.directory}/test-classes/domainapp/webapp/unittests/mavendeps/lockdown/received/LockDownMavenDeps_Test.list.txt</outputFile>
</configuration>
</execution>
<execution>
@@ -205,7 +163,7 @@
<goal>tree</goal>
</goals>
<configuration>
- <outputFile>${project.build.directory}/test-classes/domainapp/webapp/lockdown/LockDownMavenDeps_Test.tree.actual.txt</outputFile>
+ <outputFile>${project.build.directory}/test-classes/domainapp/webapp/unittests/mavendeps/lockdown/received/LockDownMavenDeps_Test.tree.txt</outputFile>
</configuration>
</execution>
</executions>
@@ -221,10 +179,6 @@
<name>docker</name>
</property>
</activation>
- <properties>
- <packaging.type>jar</packaging.type>
- <package-as-war>false</package-as-war>
- </properties>
<build>
<plugins>
<plugin>
@@ -232,16 +186,17 @@
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<from>
- <image>openjdk:13-alpine</image>
+ <image>openjdk:8-alpine</image>
</from>
<container>
<jvmFlags>
<jvmFlag>-Xmx512m</jvmFlag>
</jvmFlags>
- <mainClass>domainapp.webapp.HelloWorldApp</mainClass>
+ <mainClass>domainapp.webapp.SimpleApp</mainClass>
<ports>
<port>8080</port>
</ports>
+ <workingDirectory>/run/secrets</workingDirectory>
</container>
<to>
<image>docker.io/apacheisis/simpleapp:latest</image>
diff --git a/webapp/src/main/java/domainapp/webapp/SimpleApp.java b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
index 72a203b..cfbf890 100644
--- a/webapp/src/main/java/domainapp/webapp/SimpleApp.java
+++ b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.webapp;
import domainapp.webapp.application.ApplicationModule;
diff --git a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
index bb98c45..d5c0535 100644
--- a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
+++ b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.webapp.application;
import org.apache.isis.extensions.fixtures.modules.Module;
diff --git a/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java b/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
index 68eb5d5..c14ac14 100644
--- a/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
+++ b/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.webapp.application.fixture;
import org.apache.isis.applib.annotation.DomainService;
diff --git a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
index 6d27b9d..0e19627 100644
--- a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
+++ b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.webapp.application.fixture.scenarios;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
diff --git a/webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml b/webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml
index 0d7ca75..46c44d6 100644
--- a/webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml
+++ b/webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml
@@ -1,22 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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.
--->
<mb3:menuBars xsi:schemaLocation="http://isis.apache.org/applib/layout/menubars/bootstrap3 http://isis.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="http://isis.apache.org/applib/layout/links" xmlns:mb3="h [...]
<mb3:primary>
<mb3:menu>
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
index c6de00e..4a42b21 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.webapp.application.services.health;
import javax.inject.Inject;
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageService.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageService.java
index 1f84380..4bc23a5 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageService.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageService.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.webapp.application.services.homepage;
import javax.inject.Inject;
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
index 5d05ee6..db8cfd3 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.webapp.application.services.homepage;
import java.util.List;
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml
index 1436efc..37b0af8 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml
@@ -1,22 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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.
--->
<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="http://isis.apache.org/applib/layout/component" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="2">
diff --git a/webapp/src/main/resources/shiro.ini b/webapp/src/main/resources/shiro.ini
index 019f356..22ff9e9 100644
--- a/webapp/src/main/resources/shiro.ini
+++ b/webapp/src/main/resources/shiro.ini
@@ -1,21 +1,3 @@
-#
-# 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.
-#
[main]
diff --git a/webapp/src/main/resources/static/css/application.css b/webapp/src/main/resources/static/css/application.css
index 9f1612a..e69de29 100644
--- a/webapp/src/main/resources/static/css/application.css
+++ b/webapp/src/main/resources/static/css/application.css
@@ -1,19 +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.
- */
-
diff --git a/webapp/src/main/resources/static/index.html b/webapp/src/main/resources/static/index.html
index e25c772..33578d5 100644
--- a/webapp/src/main/resources/static/index.html
+++ b/webapp/src/main/resources/static/index.html
@@ -1,22 +1,4 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
- 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.
--->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml
index fc6da0b..9ab0567 100644
--- a/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,22 +1,4 @@
<?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.
--->
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
diff --git a/webapp/src/test/java/domainapp/webapp/bdd/RunIntegBddSpecs.java b/webapp/src/test/java/domainapp/webapp/bdd/RunIntegBddSpecs.java
index 04ede2f..7c2f316 100644
--- a/webapp/src/test/java/domainapp/webapp/bdd/RunIntegBddSpecs.java
+++ b/webapp/src/test/java/domainapp/webapp/bdd/RunIntegBddSpecs.java
@@ -1,19 +1,3 @@
-/**
- * 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 domainapp.webapp.bdd;
import io.cucumber.junit.Cucumber;
diff --git a/webapp/src/test/java/domainapp/webapp/bdd/glue/SimpleObjectsStepDef.java b/webapp/src/test/java/domainapp/webapp/bdd/glue/SimpleObjectsStepDef.java
index dabde53..2fe2e01 100644
--- a/webapp/src/test/java/domainapp/webapp/bdd/glue/SimpleObjectsStepDef.java
+++ b/webapp/src/test/java/domainapp/webapp/bdd/glue/SimpleObjectsStepDef.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.webapp.bdd.glue;
import java.util.List;
@@ -39,6 +21,7 @@ import domainapp.modules.simple.fixture.SimpleObject_persona;
import io.cucumber.java.After;
import io.cucumber.java.Before;
import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
import io.cucumber.java.en.When;
import lombok.val;
diff --git a/webapp/src/test/java/domainapp/webapp/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature b/webapp/src/test/java/domainapp/webapp/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature
index 1fb0c83..0cbca41 100644
--- a/webapp/src/test/java/domainapp/webapp/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature
+++ b/webapp/src/test/java/domainapp/webapp/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature
@@ -1,19 +1,3 @@
-#
-# 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.
-#
Feature: List and Create New Simple Objects
Scenario: Existing simple objects can be listed and new ones created
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
index f53dd7e..12ebfc9 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.webapp.integtests;
import domainapp.webapp.application.ApplicationModule;
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java
new file mode 100644
index 0000000..d751edf
--- /dev/null
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java
@@ -0,0 +1,22 @@
+package domainapp.webapp.integtests.metamodel;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+
+import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
+import org.apache.isis.metamodel.specloader.SpecificationLoader;
+
+import domainapp.webapp.integtests.ApplicationIntegTestAbstract;
+
+class ValidateDomainModel_IntegTest extends ApplicationIntegTestAbstract {
+
+ @Inject protected SpecificationLoader specificationLoader;
+
+ @Test
+ void validate() {
+ new ValidateDomainModel(specificationLoader).run();
+ }
+
+
+}
\ No newline at end of file
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/mml/MetaModelService_IntegTest.java b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/LockDownMetaModel_IntegTest.java
similarity index 55%
rename from webapp/src/test/java/domainapp/webapp/integtests/mml/MetaModelService_IntegTest.java
rename to webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/LockDownMetaModel_IntegTest.java
index cc54f7b..2bbd97d 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/mml/MetaModelService_IntegTest.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/LockDownMetaModel_IntegTest.java
@@ -1,24 +1,5 @@
-/*
- * 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 domainapp.webapp.integtests.mml;
-
-import java.io.File;
+package domainapp.webapp.integtests.metamodel.lockdown;
+
import java.util.List;
import javax.inject.Inject;
@@ -27,7 +8,6 @@ import org.approvaltests.namer.StackTraceNamer;
import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.QuietReporter;
import org.approvaltests.reporters.UseReporter;
-import org.approvaltests.writers.ApprovalTextWriter;
import org.junit.jupiter.api.Test;
import org.apache.isis.applib.services.jaxb.JaxbService;
@@ -42,8 +22,9 @@ import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assume.assumeThat;
import domainapp.webapp.integtests.ApplicationIntegTestAbstract;
+import domainapp.webapp.util.ReceivedVsApprovedApprovalTextWriter;
-class MetaModelService_IntegTest extends ApplicationIntegTestAbstract {
+class LockDownMetaModel_IntegTest extends ApplicationIntegTestAbstract {
@Inject MetaModelService metaModelService;
@Inject JaxbService jaxbService;
@@ -57,7 +38,7 @@ class MetaModelService_IntegTest extends ApplicationIntegTestAbstract {
@Test
void _1_learn() throws Exception {
- assumeThat(System.getProperty("lockdown.learn"), is(notNullValue()));
+ assumeThat(System.getProperty("learn"), is(notNullValue()));
// when
MetamodelDto metamodelDto =
@@ -91,7 +72,7 @@ class MetaModelService_IntegTest extends ApplicationIntegTestAbstract {
@Test
void _2_verify() throws Exception {
- assumeThat(System.getProperty("lockdown.verify"), is(notNullValue()));
+ assumeThat(System.getProperty("lockdown"), is(notNullValue()));
// when
MetamodelDto metamodelDto =
@@ -113,33 +94,13 @@ class MetaModelService_IntegTest extends ApplicationIntegTestAbstract {
private void verifyClass(final DomainClassDto domainClass) {
String asXml = jaxbService.toXml(domainClass);
- verify(new ApprovalTextWriter(asXml, "xml"){
- @Override public String writeReceivedFile(final String received) {
- return super.writeReceivedFile(received);
- }
-
- @Override public String getReceivedFilename(final String base) {
- return toFilename("received", base);
- }
-
- @Override public String getApprovalFilename(final String base) {
- return toFilename("approved", base);
- }
-
- private String toFilename(final String prefix, final String base) {
- final File file = new File(base);
- final File parentFile = file.getParentFile();
- final String localName = file.getName();
- final File newDir = new File(parentFile, prefix);
- final File newFile = new File(newDir, localName + ".xml");
- return newFile.toString();
- }
-
- }, new StackTraceNamer() {
- @Override public String getApprovalName() {
- return domainClass.getId();
- }
- }, getReporter());
+ verify(
+ new ReceivedVsApprovedApprovalTextWriter(asXml, "xml"),
+ new StackTraceNamer() {
+ @Override public String getApprovalName() {
+ return domainClass.getId();
+ }
+ }, getReporter());
}
}
\ No newline at end of file
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
similarity index 90%
rename from webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
rename to webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
index b664f8d..ee38c84 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
@@ -56,6 +56,10 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.icon.IconFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobjectlayout.IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent">
<mml:attr name="iconUiEventClass">org.apache.isis.applib.events.ui.IconUiEvent.Default</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.editing.ImmutableFacetForDomainObjectAnnotationAsConfigured">
+ <mml:attr name="disabling">true</mml:attr>
+ <mml:attr name="reason">Disabled</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.layout.LayoutFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobjectlayout.LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent">
<mml:attr name="layoutUiEventClass">org.apache.isis.applib.events.ui.LayoutUiEvent.Default</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.object.layout.LayoutFacetFallback</mml:attr>
@@ -71,6 +75,7 @@
<mml:attr name="value">25</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.plural.PluralFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobjectlayout.PluralFacetForDomainObjectLayoutAnnotation"/>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetForDomainObjectAnnotationAsConfigured"/>
<mml:facet id="org.apache.isis.metamodel.facets.object.title.TitleFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobjectlayout.TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent">
<mml:attr name="titleUiEventClass">org.apache.isis.applib.events.ui.TitleUiEvent.Default</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.object.title.methods.TitleFacetViaTitleMethod</mml:attr>
@@ -96,6 +101,11 @@
<mml:attr name="onType">org.apache.isis.jdo.jdosupport.mixins.Persistable_datanucleusIdLong</mml:attr>
<mml:attr name="returnType">java.lang.Long</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ASSOCIATION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -103,6 +113,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
<mml:attr name="position">BELOW</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -146,6 +157,7 @@
<mml:attr name="hiding">true</mml:attr>
<mml:attr name="where">ALL_TABLES</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:type>java.lang.Long</mml:type>
</mml:prop>
@@ -168,6 +180,11 @@
<mml:attr name="onType">org.apache.isis.jdo.jdosupport.mixins.Persistable_datanucleusVersionLong</mml:attr>
<mml:attr name="returnType">java.lang.Long</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ASSOCIATION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -175,6 +192,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
<mml:attr name="position">BELOW</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -218,6 +236,7 @@
<mml:attr name="hiding">true</mml:attr>
<mml:attr name="where">ALL_TABLES</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:type>java.lang.Long</mml:type>
</mml:prop>
@@ -240,6 +259,11 @@
<mml:attr name="onType">org.apache.isis.jdo.jdosupport.mixins.Persistable_datanucleusVersionTimestamp</mml:attr>
<mml:attr name="returnType">java.sql.Timestamp</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ASSOCIATION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -247,6 +271,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
<mml:attr name="position">BELOW</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -290,6 +315,7 @@
<mml:attr name="hiding">true</mml:attr>
<mml:attr name="where">ALL_TABLES</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:type>java.sql.Timestamp</mml:type>
</mml:prop>
@@ -299,6 +325,11 @@
<mml:attr name="disabling">true</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
<mml:facet id="org.apache.isis.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.metamodel.facets.all.i18n.NamedFacetTranslated">
<mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObject#name</mml:attr>
@@ -351,6 +382,7 @@
<mml:attr name="validating">true</mml:attr>
<mml:attr name="value">org.apache.isis.applib.events.domain.PropertyDomainEvent.Default</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.properties.update.clear.PropertyClearFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.modify.PropertyClearFacetForDomainEventFromDefault">
<mml:attr name="clearFacet">org.apache.isis.metamodel.facets.properties.update.clear.PropertyClearFacetViaSetterMethod</mml:attr>
<mml:attr name="getterFacet">org.apache.isis.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor</mml:attr>
@@ -379,6 +411,11 @@
<mml:attr name="disabling">true</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
<mml:facet id="org.apache.isis.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.metamodel.facets.all.i18n.NamedFacetTranslated">
<mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObject#notes</mml:attr>
@@ -427,6 +464,7 @@
<mml:attr name="validating">true</mml:attr>
<mml:attr name="value">org.apache.isis.applib.events.domain.PropertyDomainEvent.Default</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.properties.update.clear.PropertyClearFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.modify.PropertyClearFacetForDomainEventFromDefault">
<mml:attr name="clearFacet">org.apache.isis.metamodel.facets.properties.update.clear.PropertyClearFacetViaSetterMethod</mml:attr>
<mml:attr name="getterFacet">org.apache.isis.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor</mml:attr>
@@ -468,6 +506,11 @@
<mml:attr name="onType">org.apache.isis.applib.mixins.metamodel.Object_objectIdentifier</mml:attr>
<mml:attr name="returnType">java.lang.String</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ASSOCIATION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -475,6 +518,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
<mml:attr name="position">BELOW</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -519,6 +563,7 @@
<mml:attr name="validating">true</mml:attr>
<mml:attr name="value">org.apache.isis.applib.events.domain.PropertyDomainEvent.Default</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:type>java.lang.String</mml:type>
</mml:prop>
@@ -541,6 +586,11 @@
<mml:attr name="onType">org.apache.isis.applib.mixins.metamodel.Object_objectType</mml:attr>
<mml:attr name="returnType">java.lang.String</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ASSOCIATION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -548,6 +598,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
<mml:attr name="position">BELOW</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -592,6 +643,7 @@
<mml:attr name="validating">true</mml:attr>
<mml:attr name="value">org.apache.isis.applib.events.domain.PropertyDomainEvent.Default</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:type>java.lang.String</mml:type>
</mml:prop>
@@ -617,9 +669,16 @@
<mml:attr name="onType">domainapp.modules.simple.dom.impl.SimpleObject</mml:attr>
<mml:attr name="returnType">void</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ <mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
<mml:attr name="position">BELOW</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacetFallback">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -635,12 +694,16 @@
<mml:facet id="org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacet" fqcn="org.apache.isis.metamodel.facets.collections.layout.DefaultViewFacetForCollectionLayoutAnnotation">
<mml:attr name="value">hidden</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet" fqcn="org.apache.isis.metamodel.facets.members.cssclass.annotprop.CssClassFacetOnActionFromConfiguredRegex">
+ <mml:attr name="cssClass">btn-danger</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
<mml:attr name="bookmarkPolicy">NEVER</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
<mml:attr name="promptStyle">INLINE</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>void</mml:returnType>
<mml:params/>
@@ -664,6 +727,11 @@
<mml:attr name="onType">org.apache.isis.jdo.jdosupport.mixins.Persistable_downloadJdoMetadata</mml:attr>
<mml:attr name="returnType">org.apache.isis.applib.value.Clob</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ACTION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -675,6 +743,7 @@
<mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -705,6 +774,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
<mml:attr name="promptStyle">INLINE</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>org.apache.isis.applib.value.Clob</mml:returnType>
<mml:params>
@@ -753,6 +823,11 @@
<mml:attr name="onType">org.apache.isis.applib.mixins.layout.Object_downloadLayoutXml</mml:attr>
<mml:attr name="returnType">java.lang.Object</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ACTION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -764,6 +839,7 @@
<mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -794,6 +870,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
<mml:attr name="promptStyle">INLINE</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>java.lang.Object</mml:returnType>
<mml:params>
@@ -871,6 +948,11 @@
<mml:attr name="onType">org.apache.isis.applib.mixins.metamodel.Object_downloadMetaModelXml</mml:attr>
<mml:attr name="returnType">java.lang.Object</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ACTION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -882,6 +964,7 @@
<mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -912,6 +995,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
<mml:attr name="promptStyle">INLINE</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>java.lang.Object</mml:returnType>
<mml:params>
@@ -965,6 +1049,11 @@
<mml:attr name="onType">org.apache.isis.applib.mixins.layout.Object_openRestApi</mml:attr>
<mml:attr name="returnType">org.apache.isis.applib.value.LocalResourcePath</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ACTION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -976,6 +1065,7 @@
<mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -1006,6 +1096,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
<mml:attr name="promptStyle">INLINE</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>org.apache.isis.applib.value.LocalResourcePath</mml:returnType>
<mml:params/>
@@ -1029,6 +1120,12 @@
<mml:attr name="onType">org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel</mml:attr>
<mml:attr name="returnType">java.lang.Object</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ <mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ACTION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -1040,6 +1137,7 @@
<mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -1070,6 +1168,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
<mml:attr name="promptStyle">INLINE</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>java.lang.Object</mml:returnType>
<mml:params/>
@@ -1096,10 +1195,11 @@
<mml:attr name="onType">domainapp.modules.simple.dom.impl.SimpleObject</mml:attr>
<mml:attr name="returnType">domainapp.modules.simple.dom.impl.SimpleObject</mml:attr>
</mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetForActionAnnotation">
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
<mml:attr name="disabled">false</mml:attr>
<mml:attr name="executeIn">FOREGROUND</mml:attr>
<mml:attr name="persistence">PERSISTED</mml:attr>
+ <mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.action.command.CommandFacetForActionAnnotation</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
<mml:attr name="position">BELOW</mml:attr>
@@ -1131,6 +1231,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
<mml:attr name="promptStyle">INLINE</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>domainapp.modules.simple.dom.impl.SimpleObject</mml:returnType>
<mml:params>
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
similarity index 71%
rename from webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
rename to webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
index 6e0d844..8733340 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
@@ -9,6 +9,9 @@
<mml:attr name="escaped">true</mml:attr>
<mml:attr name="value">Simple Objects</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.audit.AuditableFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditableFacetFromConfiguration">
+ <mml:attr name="enablement">ENABLED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
<mml:attr name="bookmarkPolicy">NEVER</mml:attr>
</mml:facet>
@@ -23,6 +26,10 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.icon.IconFacet" fqcn="org.apache.isis.metamodel.facets.object.domainservice.annotation.IconFacetDerivedFromDomainServiceAnnotation">
<mml:attr name="repositoryFor">java.lang.Object</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.editing.ImmutableFacetFromConfiguration">
+ <mml:attr name="disabling">true</mml:attr>
+ <mml:attr name="reason">Disabled</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.layout.LayoutFacet" fqcn="org.apache.isis.metamodel.facets.object.layout.LayoutFacetFallback">
<mml:attr name="derived">true</mml:attr>
</mml:facet>
@@ -40,6 +47,7 @@
<mml:attr name="derived">true</mml:attr>
<mml:attr name="value">Simple Objectses</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetFromConfiguration"/>
</mml:facets>
<mml:actions>
<mml:act id="create">
@@ -61,9 +69,16 @@
<mml:attr name="onType">domainapp.modules.simple.dom.impl.SimpleObjects</mml:attr>
<mml:attr name="returnType">domainapp.modules.simple.dom.impl.SimpleObject</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ <mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
<mml:attr name="position">BELOW</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -85,6 +100,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.PromptStyleFacetForActionLayoutAnnotation">
<mml:attr name="promptStyle">DIALOG_MODAL</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>domainapp.modules.simple.dom.impl.SimpleObject</mml:returnType>
<mml:params>
@@ -151,9 +167,15 @@
<mml:attr name="onType">domainapp.modules.simple.dom.impl.SimpleObjects</mml:attr>
<mml:attr name="returnType">java.util.List</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
<mml:attr name="position">BELOW</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -176,6 +198,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.PromptStyleFacetForActionLayoutAnnotation">
<mml:attr name="promptStyle">DIALOG_SIDEBAR</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>java.util.List</mml:returnType>
<mml:params>
@@ -219,83 +242,6 @@
</mml:param>
</mml:params>
</mml:act>
- <mml:act id="findByNameExact">
- <mml:facets>
- <mml:facet id="org.apache.isis.metamodel.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.metamodel.authorization.standard.AuthorizationFacetImpl">
- <mml:attr name="disabling">true</mml:attr>
- <mml:attr name="hiding">true</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.actions.action.invocation.ActionDomainEventFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.invocation.ActionDomainEventFacetDefault">
- <mml:attr name="disabling">true</mml:attr>
- <mml:attr name="hiding">true</mml:attr>
- <mml:attr name="validating">true</mml:attr>
- <mml:attr name="value">org.apache.isis.applib.events.domain.ActionDomainEvent.Default</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromDefault">
- <mml:attr name="eventType">org.apache.isis.applib.events.domain.ActionDomainEvent.Default</mml:attr>
- <mml:attr name="intent.findByNameExact">EXECUTE</mml:attr>
- <mml:attr name="methods">public domainapp.modules.simple.dom.impl.SimpleObject domainapp.modules.simple.dom.impl.SimpleObjects.findByNameExact(java.lang.String)</mml:attr>
- <mml:attr name="onType">domainapp.modules.simple.dom.impl.SimpleObjects</mml:attr>
- <mml:attr name="returnType">domainapp.modules.simple.dom.impl.SimpleObject</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
- <mml:attr name="position">BELOW</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacetFallback">
- <mml:attr name="redirect">AS_CONFIGURED</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.semantics.ActionSemanticsFacetFallbackToNonIdempotent">
- <mml:attr name="value">NON_IDEMPOTENT</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
- <mml:facet id="org.apache.isis.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.metamodel.facets.all.i18n.NamedFacetTranslated">
- <mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObjects#findByNameExact()</mml:attr>
- <mml:attr name="originalText">Find By Name Exact</mml:attr>
- <mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.fallback.NamedFacetDefault</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacet" fqcn="org.apache.isis.metamodel.facets.collections.layout.DefaultViewFacetForCollectionLayoutAnnotation">
- <mml:attr name="value">hidden</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
- <mml:attr name="bookmarkPolicy">NEVER</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
- <mml:attr name="promptStyle">INLINE</mml:attr>
- </mml:facet>
- </mml:facets>
- <mml:returnType>domainapp.modules.simple.dom.impl.SimpleObject</mml:returnType>
- <mml:params>
- <mml:param xsi:type="mml:scalarParam" id="name" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <mml:facets>
- <mml:facet id="org.apache.isis.metamodel.facets.actions.defaults.ActionDefaultsFacet" fqcn="org.apache.isis.metamodel.facets.param.defaults.fromtype.ActionParameterDefaultFacetDerivedFromTypeFacets">
- <mml:attr name="defaultFacets">org.apache.isis.metamodel.facets.object.defaults.DefaultedFacetUsingDefaultsProvider</mml:attr>
- <mml:attr name="derived">true</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.metamodel.facets.param.describedas.annotderived.DescribedAsFacetOnParameterDerivedFromType"/>
- <mml:facet id="org.apache.isis.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.metamodel.facets.all.i18n.NamedFacetTranslated">
- <mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObjects#findByNameExact(java.lang.String)</mml:attr>
- <mml:attr name="originalText">Name</mml:attr>
- <mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.param.name.NamedFacetForParameterUsingReflection</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.objectvalue.labelat.LabelAtFacet" fqcn="org.apache.isis.metamodel.facets.fallback.LabelAtFacetFromLayoutConfiguration">
- <mml:attr name="label">NOT_SPECIFIED</mml:attr>
- <mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.fallback.LabelAtFacetFromLayoutConfiguration</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.objectvalue.mandatory.MandatoryFacet" fqcn="org.apache.isis.metamodel.facets.objectvalue.mandatory.MandatoryFacetDefault">
- <mml:attr name="inverted">false</mml:attr>
- <mml:attr name="semantics">REQUIRED</mml:attr>
- <mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.objectvalue.mandatory.MandatoryFacetDefault</mml:attr>
- <mml:attr name="validating">true</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet" fqcn="org.apache.isis.metamodel.facets.param.typicallen.fromtype.TypicalLengthFacetOnParameterDerivedFromType">
- <mml:attr name="derived">true</mml:attr>
- <mml:attr name="typicalLengthFacet">org.apache.isis.metamodel.facets.object.value.TypicalLengthFacetUsingParser</mml:attr>
- </mml:facet>
- </mml:facets>
- <mml:type>java.lang.String</mml:type>
- </mml:param>
- </mml:params>
- </mml:act>
<mml:act id="listAll">
<mml:facets>
<mml:facet id="org.apache.isis.metamodel.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.metamodel.authorization.standard.AuthorizationFacetImpl">
@@ -319,9 +265,15 @@
<mml:attr name="onType">domainapp.modules.simple.dom.impl.SimpleObjects</mml:attr>
<mml:attr name="returnType">java.util.List</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
<mml:attr name="position">BELOW</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -344,56 +296,10 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
<mml:attr name="promptStyle">INLINE</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>java.util.List</mml:returnType>
<mml:params/>
</mml:act>
- <mml:act id="ping">
- <mml:facets>
- <mml:facet id="org.apache.isis.metamodel.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.metamodel.authorization.standard.AuthorizationFacetImpl">
- <mml:attr name="disabling">true</mml:attr>
- <mml:attr name="hiding">true</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.actions.action.invocation.ActionDomainEventFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.invocation.ActionDomainEventFacetDefault">
- <mml:attr name="disabling">true</mml:attr>
- <mml:attr name="hiding">true</mml:attr>
- <mml:attr name="validating">true</mml:attr>
- <mml:attr name="value">org.apache.isis.applib.events.domain.ActionDomainEvent.Default</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromDefault">
- <mml:attr name="eventType">org.apache.isis.applib.events.domain.ActionDomainEvent.Default</mml:attr>
- <mml:attr name="intent.ping">EXECUTE</mml:attr>
- <mml:attr name="methods">public void domainapp.modules.simple.dom.impl.SimpleObjects.ping()</mml:attr>
- <mml:attr name="onType">domainapp.modules.simple.dom.impl.SimpleObjects</mml:attr>
- <mml:attr name="returnType">void</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
- <mml:attr name="position">BELOW</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacetFallback">
- <mml:attr name="redirect">AS_CONFIGURED</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.semantics.ActionSemanticsFacetFallbackToNonIdempotent">
- <mml:attr name="value">NON_IDEMPOTENT</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
- <mml:facet id="org.apache.isis.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.metamodel.facets.all.i18n.NamedFacetTranslated">
- <mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObjects#ping()</mml:attr>
- <mml:attr name="originalText">Ping</mml:attr>
- <mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.fallback.NamedFacetDefault</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.collections.collection.defaultview.DefaultViewFacet" fqcn="org.apache.isis.metamodel.facets.collections.layout.DefaultViewFacetForCollectionLayoutAnnotation">
- <mml:attr name="value">hidden</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
- <mml:attr name="bookmarkPolicy">NEVER</mml:attr>
- </mml:facet>
- <mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
- <mml:attr name="promptStyle">INLINE</mml:attr>
- </mml:facet>
- </mml:facets>
- <mml:returnType>void</mml:returnType>
- <mml:params/>
- </mml:act>
</mml:actions>
</mml:domainClassDto>
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
similarity index 78%
rename from webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
rename to webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
index 84cfa08..e240e84 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mml:domainClassDto id="domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider" service="true" xmlns:mml="http://isis.apache.org/schema/metamodel">
+<mml:domainClassDto id="domainapp.webapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider" service="true" xmlns:mml="http://isis.apache.org/schema/metamodel">
<mml:facets>
<mml:facet id="org.apache.isis.metamodel.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.metamodel.authorization.standard.AuthorizationFacetImpl">
<mml:attr name="disabling">true</mml:attr>
@@ -9,6 +9,9 @@
<mml:attr name="escaped">true</mml:attr>
<mml:attr name="value">Domain App Fixture Scripts Specification Provider</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.audit.AuditableFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditableFacetFromConfiguration">
+ <mml:attr name="enablement">ENABLED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
<mml:attr name="bookmarkPolicy">NEVER</mml:attr>
</mml:facet>
@@ -23,6 +26,10 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.icon.IconFacet" fqcn="org.apache.isis.metamodel.facets.object.domainservice.annotation.IconFacetDerivedFromDomainServiceAnnotation">
<mml:attr name="repositoryFor">java.lang.Object</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.editing.ImmutableFacetFromConfiguration">
+ <mml:attr name="disabling">true</mml:attr>
+ <mml:attr name="reason">Disabled</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.layout.LayoutFacet" fqcn="org.apache.isis.metamodel.facets.object.layout.LayoutFacetFallback">
<mml:attr name="derived">true</mml:attr>
</mml:facet>
@@ -40,5 +47,6 @@
<mml:attr name="derived">true</mml:attr>
<mml:attr name="value">Domain App Fixture Scripts Specification Providers</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetFromConfiguration"/>
</mml:facets>
</mml:domainClassDto>
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.application.services.health.HealthCheckServiceImpl.xml b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.services.health.HealthCheckServiceImpl.xml
similarity index 78%
rename from webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.application.services.health.HealthCheckServiceImpl.xml
rename to webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.services.health.HealthCheckServiceImpl.xml
index ec21c6c..da9f32f 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.application.services.health.HealthCheckServiceImpl.xml
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.services.health.HealthCheckServiceImpl.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mml:domainClassDto id="domainapp.application.services.health.HealthCheckServiceImpl" service="true" xmlns:mml="http://isis.apache.org/schema/metamodel">
+<mml:domainClassDto id="domainapp.webapp.application.services.health.HealthCheckServiceImpl" service="true" xmlns:mml="http://isis.apache.org/schema/metamodel">
<mml:facets>
<mml:facet id="org.apache.isis.metamodel.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.metamodel.authorization.standard.AuthorizationFacetImpl">
<mml:attr name="disabling">true</mml:attr>
@@ -9,6 +9,9 @@
<mml:attr name="escaped">true</mml:attr>
<mml:attr name="value">Health Check Service Impl</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.audit.AuditableFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditableFacetFromConfiguration">
+ <mml:attr name="enablement">ENABLED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
<mml:attr name="bookmarkPolicy">NEVER</mml:attr>
</mml:facet>
@@ -23,6 +26,10 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.icon.IconFacet" fqcn="org.apache.isis.metamodel.facets.object.domainservice.annotation.IconFacetDerivedFromDomainServiceAnnotation">
<mml:attr name="repositoryFor">java.lang.Object</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.editing.ImmutableFacetFromConfiguration">
+ <mml:attr name="disabling">true</mml:attr>
+ <mml:attr name="reason">Disabled</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.layout.LayoutFacet" fqcn="org.apache.isis.metamodel.facets.object.layout.LayoutFacetFallback">
<mml:attr name="derived">true</mml:attr>
</mml:facet>
@@ -40,5 +47,6 @@
<mml:attr name="derived">true</mml:attr>
<mml:attr name="value">Health Check Service Impls</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetFromConfiguration"/>
</mml:facets>
</mml:domainClassDto>
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.services.homepage.HomePageViewModel.xml
similarity index 87%
rename from webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
rename to webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.services.homepage.HomePageViewModel.xml
index c176172..281f98e 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.services.homepage.HomePageViewModel.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mml:domainClassDto id="domainapp.application.services.homepage.HomePageViewModel" xmlns:mml="http://isis.apache.org/schema/metamodel">
+<mml:domainClassDto id="domainapp.webapp.application.services.homepage.HomePageViewModel" xmlns:mml="http://isis.apache.org/schema/metamodel">
<mml:facets>
<mml:facet id="org.apache.isis.metamodel.authorization.standard.AuthorizationFacet" fqcn="org.apache.isis.metamodel.authorization.standard.AuthorizationFacetImpl">
<mml:attr name="disabling">true</mml:attr>
@@ -9,6 +9,9 @@
<mml:attr name="escaped">true</mml:attr>
<mml:attr name="value">Home Page View Model</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.audit.AuditableFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditableFacetForDomainObjectAnnotationAsConfigured">
+ <mml:attr name="enablement">ENABLED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet" fqcn="org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback">
<mml:attr name="bookmarkPolicy">NEVER</mml:attr>
</mml:facet>
@@ -34,12 +37,16 @@
<mml:attr name="value">org.apache.isis.applib.events.lifecycle.ObjectUpdatingEvent.Default</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.grid.GridFacet" fqcn="org.apache.isis.metamodel.facets.object.grid.GridFacetDefault"/>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.editing.ImmutableFacetForDomainObjectAnnotationAsConfigured">
+ <mml:attr name="disabling">true</mml:attr>
+ <mml:attr name="reason">Disabled</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.layout.LayoutFacet" fqcn="org.apache.isis.metamodel.facets.object.layout.LayoutFacetFallback">
<mml:attr name="derived">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetForDomainObjectAnnotation">
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName</mml:attr>
- <mml:attr name="value">domainapp.webapp.application.services.homepage.HomePageViewModel</mml:attr>
+ <mml:attr name="value">domainapp.HomePageViewModel</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.isis.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
<mml:attr name="validating">true</mml:attr>
@@ -52,10 +59,10 @@
<mml:attr name="derived">true</mml:attr>
<mml:attr name="value">Home Page View Models</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetForDomainObjectAnnotationAsConfigured"/>
<mml:facet id="org.apache.isis.metamodel.facets.object.title.TitleFacet" fqcn="org.apache.isis.metamodel.facets.object.title.methods.TitleFacetViaTitleMethod">
<mml:attr name="intent.title">UI_HINT</mml:attr>
- <mml:attr name="methods">public org.apache.isis.applib.services.i18n.TranslatableString
- domainapp.webapp.application.services.homepage.HomePageViewModel.title()</mml:attr>
+ <mml:attr name="methods">public org.apache.isis.applib.services.i18n.TranslatableString domainapp.webapp.application.services.homepage.HomePageViewModel.title()</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.viewmodel.ViewModelFacet" fqcn="org.apache.isis.metamodel.facets.object.domainobject.recreatable.RecreatableObjectFacetForDomainObjectAnnotation">
<mml:attr name="recreationMechanism">INITIALIZES</mml:attr>
@@ -81,6 +88,11 @@
<mml:attr name="onType">org.apache.isis.applib.mixins.metamodel.Object_objectIdentifier</mml:attr>
<mml:attr name="returnType">java.lang.String</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ASSOCIATION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -88,6 +100,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
<mml:attr name="position">BELOW</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -96,7 +109,7 @@
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
<mml:facet id="org.apache.isis.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.metamodel.facets.all.i18n.NamedFacetTranslated">
- <mml:attr name="context">domainapp.application.services.homepage.HomePageViewModel#objectIdentifier()</mml:attr>
+ <mml:attr name="context">domainapp.webapp.application.services.homepage.HomePageViewModel#objectIdentifier()</mml:attr>
<mml:attr name="originalText">Object Identifier</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.all.named.NamedFacetInferred</mml:attr>
</mml:facet>
@@ -132,6 +145,7 @@
<mml:attr name="validating">true</mml:attr>
<mml:attr name="value">org.apache.isis.applib.events.domain.PropertyDomainEvent.Default</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:type>java.lang.String</mml:type>
</mml:prop>
@@ -154,6 +168,11 @@
<mml:attr name="onType">org.apache.isis.applib.mixins.metamodel.Object_objectType</mml:attr>
<mml:attr name="returnType">java.lang.String</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ASSOCIATION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -161,6 +180,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet" fqcn="org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback">
<mml:attr name="position">BELOW</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -169,7 +189,7 @@
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
<mml:facet id="org.apache.isis.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.metamodel.facets.all.i18n.NamedFacetTranslated">
- <mml:attr name="context">domainapp.application.services.homepage.HomePageViewModel#objectType()</mml:attr>
+ <mml:attr name="context">domainapp.webapp.application.services.homepage.HomePageViewModel#objectType()</mml:attr>
<mml:attr name="originalText">Object Type</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.all.named.NamedFacetInferred</mml:attr>
</mml:facet>
@@ -205,6 +225,7 @@
<mml:attr name="validating">true</mml:attr>
<mml:attr name="value">org.apache.isis.applib.events.domain.PropertyDomainEvent.Default</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:type>java.lang.String</mml:type>
</mml:prop>
@@ -221,7 +242,7 @@
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
<mml:facet id="org.apache.isis.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.metamodel.facets.all.i18n.NamedFacetTranslated">
- <mml:attr name="context">domainapp.application.services.homepage.HomePageViewModel#objects</mml:attr>
+ <mml:attr name="context">domainapp.webapp.application.services.homepage.HomePageViewModel#objects</mml:attr>
<mml:attr name="originalText">Objects</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.fallback.NamedFacetDefault</mml:attr>
</mml:facet>
@@ -243,8 +264,7 @@
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.collections.modify.CollectionClearFacet" fqcn="org.apache.isis.metamodel.facets.collections.clear.CollectionClearFacetViaAccessor">
<mml:attr name="intent.getObjects">ACCESSOR</mml:attr>
- <mml:attr name="methods">public java.util.List<domainapp.modules.simple.dom.impl.SimpleObject>
- domainapp.webapp.application.services.homepage.HomePageViewModel.getObjects()</mml:attr>
+ <mml:attr name="methods">public java.util.List<domainapp.modules.simple.dom.impl.SimpleObject> domainapp.webapp.application.services.homepage.HomePageViewModel.getObjects()</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacet" fqcn="org.apache.isis.metamodel.facets.collections.collection.modify.CollectionRemoveFromFacetForDomainEventFromDefault">
<mml:attr name="collectionRemoveFromFacet">org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacetViaAccessor</mml:attr>
@@ -255,6 +275,12 @@
<mml:facet id="org.apache.isis.metamodel.facets.collparam.semantics.CollectionSemanticsFacet" fqcn="org.apache.isis.metamodel.facets.collparam.semantics.CollectionSemanticsFacetDefault">
<mml:attr name="value">LIST_INTERFACE</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.members.disabled.DisabledFacet" fqcn="org.apache.isis.metamodel.facets.collections.disabled.fromimmutable.DisabledFacetOnCollectionDerivedFromImmutable">
+ <mml:attr name="disabling">true</mml:attr>
+ <mml:attr name="inverted">false</mml:attr>
+ <mml:attr name="semantics">DISABLED</mml:attr>
+ <mml:attr name="where">ANYWHERE</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.object.paged.PagedFacet" fqcn="org.apache.isis.metamodel.facets.fallback.PagedFacetFromConfiguration">
<mml:attr name="derived">true</mml:attr>
<mml:attr name="value">12</mml:attr>
@@ -267,8 +293,7 @@
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet" fqcn="org.apache.isis.metamodel.facets.collections.accessor.CollectionAccessorFacetViaAccessor">
<mml:attr name="intent.getObjects">ACCESSOR</mml:attr>
- <mml:attr name="methods">public java.util.List<domainapp.modules.simple.dom.impl.SimpleObject>
- domainapp.webapp.application.services.homepage.HomePageViewModel.getObjects()</mml:attr>
+ <mml:attr name="methods">public java.util.List<domainapp.modules.simple.dom.impl.SimpleObject> domainapp.webapp.application.services.homepage.HomePageViewModel.getObjects()</mml:attr>
<mml:attr name="onType">domainapp.webapp.application.services.homepage.HomePageViewModel</mml:attr>
</mml:facet>
</mml:facets>
@@ -295,6 +320,11 @@
<mml:attr name="onType">org.apache.isis.applib.mixins.layout.Object_downloadLayoutXml</mml:attr>
<mml:attr name="returnType">java.lang.Object</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ACTION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -306,6 +336,7 @@
<mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -314,7 +345,7 @@
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
<mml:facet id="org.apache.isis.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.metamodel.facets.all.i18n.NamedFacetTranslated">
- <mml:attr name="context">domainapp.application.services.homepage.HomePageViewModel#downloadLayoutXml()</mml:attr>
+ <mml:attr name="context">domainapp.webapp.application.services.homepage.HomePageViewModel#downloadLayoutXml()</mml:attr>
<mml:attr name="originalText">Download Layout Xml</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.all.named.NamedFacetInferred</mml:attr>
</mml:facet>
@@ -336,6 +367,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
<mml:attr name="promptStyle">INLINE</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>java.lang.Object</mml:returnType>
<mml:params>
@@ -413,6 +445,11 @@
<mml:attr name="onType">org.apache.isis.applib.mixins.metamodel.Object_downloadMetaModelXml</mml:attr>
<mml:attr name="returnType">java.lang.Object</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ACTION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -424,6 +461,7 @@
<mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -432,7 +470,7 @@
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
<mml:facet id="org.apache.isis.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.metamodel.facets.all.i18n.NamedFacetTranslated">
- <mml:attr name="context">domainapp.application.services.homepage.HomePageViewModel#downloadMetaModelXml()</mml:attr>
+ <mml:attr name="context">domainapp.webapp.application.services.homepage.HomePageViewModel#downloadMetaModelXml()</mml:attr>
<mml:attr name="originalText">Download Meta Model Xml</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.all.named.NamedFacetInferred</mml:attr>
</mml:facet>
@@ -454,6 +492,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
<mml:attr name="promptStyle">INLINE</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>java.lang.Object</mml:returnType>
<mml:params>
@@ -507,6 +546,11 @@
<mml:attr name="onType">org.apache.isis.applib.mixins.layout.Object_openRestApi</mml:attr>
<mml:attr name="returnType">org.apache.isis.applib.value.LocalResourcePath</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ACTION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -518,6 +562,7 @@
<mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -526,7 +571,7 @@
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
<mml:facet id="org.apache.isis.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.metamodel.facets.all.i18n.NamedFacetTranslated">
- <mml:attr name="context">domainapp.application.services.homepage.HomePageViewModel#openRestApi()</mml:attr>
+ <mml:attr name="context">domainapp.webapp.application.services.homepage.HomePageViewModel#openRestApi()</mml:attr>
<mml:attr name="originalText">Open Rest Api</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.all.named.NamedFacetInferred</mml:attr>
</mml:facet>
@@ -548,6 +593,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
<mml:attr name="promptStyle">INLINE</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>org.apache.isis.applib.value.LocalResourcePath</mml:returnType>
<mml:params/>
@@ -571,6 +617,12 @@
<mml:attr name="onType">org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel</mml:attr>
<mml:attr name="returnType">java.lang.Object</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
+ <mml:attr name="disabled">false</mml:attr>
+ <mml:attr name="executeIn">FOREGROUND</mml:attr>
+ <mml:attr name="persistence">PERSISTED</mml:attr>
+ <mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration</mml:attr>
+ </mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation">
<mml:attr name="contributed">AS_ACTION</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacet</mml:attr>
@@ -582,6 +634,7 @@
<mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet" fqcn="org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration"/>
<mml:facet id="org.apache.isis.metamodel.facets.actions.redirect.RedirectFacet" fqcn="org.apache.isis.metamodel.facets.actions.layout.RedirectFacetFromActionLayoutAnnotation">
<mml:attr name="redirect">AS_CONFIGURED</mml:attr>
</mml:facet>
@@ -590,7 +643,7 @@
</mml:facet>
<mml:facet id="org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
<mml:facet id="org.apache.isis.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.metamodel.facets.all.i18n.NamedFacetTranslated">
- <mml:attr name="context">domainapp.application.services.homepage.HomePageViewModel#rebuildMetamodel()</mml:attr>
+ <mml:attr name="context">domainapp.webapp.application.services.homepage.HomePageViewModel#rebuildMetamodel()</mml:attr>
<mml:attr name="originalText">Rebuild Metamodel</mml:attr>
<mml:attr name="underlyingFacet">org.apache.isis.metamodel.facets.all.named.NamedFacetInferred</mml:attr>
</mml:facet>
@@ -612,6 +665,7 @@
<mml:facet id="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacet" fqcn="org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured">
<mml:attr name="promptStyle">INLINE</mml:attr>
</mml:facet>
+ <mml:facet id="org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet" fqcn="org.apache.isis.metamodel.facets.properties.property.publishing.PublishedPropertyFacetFromConfiguration"/>
</mml:facets>
<mml:returnType>java.lang.Object</mml:returnType>
<mml:params/>
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/mml/received/.gitignore b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/received/.gitignore
similarity index 100%
rename from webapp/src/test/java/domainapp/webapp/integtests/mml/received/.gitignore
rename to webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/received/.gitignore
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/mml/DomainModel_IntegTest.java b/webapp/src/test/java/domainapp/webapp/integtests/mml/DomainModel_IntegTest.java
deleted file mode 100644
index ed2a754..0000000
--- a/webapp/src/test/java/domainapp/webapp/integtests/mml/DomainModel_IntegTest.java
+++ /dev/null
@@ -1,41 +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 domainapp.webapp.integtests.mml;
-
-import javax.inject.Inject;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
-
-import domainapp.webapp.integtests.ApplicationIntegTestAbstract;
-
-class DomainModel_IntegTest extends ApplicationIntegTestAbstract {
-
- @Inject protected SpecificationLoader specificationLoader;
-
- @Test
- void validateDomainModel() {
- new ValidateDomainModel(specificationLoader).run();
- }
-
-
-}
\ No newline at end of file
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java b/webapp/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
index ed307fa..15825f4 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
@@ -1,21 +1,3 @@
-/*
- * 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 domainapp.webapp.integtests.smoke;
import java.util.List;
diff --git a/webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.java b/webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.java
deleted file mode 100644
index f64caf2..0000000
--- a/webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package domainapp.webapp.lockdown;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
-
-import org.approvaltests.Approvals;
-import org.approvaltests.reporters.DiffReporter;
-import org.approvaltests.reporters.UseReporter;
-import org.assertj.core.api.Assumptions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
-
-import static org.hamcrest.CoreMatchers.*;
-
-public class LockDownMavenDeps_Test {
-
- @BeforeEach
- public void setUp() throws Exception {
- Assumptions.assumeThat(System.getProperty("lockdown")).isNotNull();
- }
-
- @UseReporter(DiffReporter.class)
- @Test
- public void list() throws Exception {
- Approvals.verify(sort(read("list")));
- }
-
- @UseReporter(DiffReporter.class)
- @Test
- public void tree() throws Exception {
- Approvals.verify(read("tree"));
- }
-
- private String read(final String goal) throws IOException {
- final URL resource = Resources.getResource(getClass(),
- String.format("%s.%s.actual.txt", getClass().getSimpleName(), goal));
- return Resources.toString(resource, Charsets.UTF_8);
- }
-
- private static String sort(final String unsorted) {
- final String[] lines = unsorted.split("[\r\n]+");
- Arrays.sort(lines);
- return String.join("\n", lines);
- }
-
-}
diff --git a/webapp/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/LockDownMavenDeps_Test.java b/webapp/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/LockDownMavenDeps_Test.java
new file mode 100644
index 0000000..7471f73
--- /dev/null
+++ b/webapp/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/LockDownMavenDeps_Test.java
@@ -0,0 +1,71 @@
+package domainapp.webapp.unittests.mavendeps.lockdown;
+
+import domainapp.webapp.util.ReceivedVsApprovedApprovalTextWriter;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Arrays;
+
+import org.approvaltests.namer.StackTraceNamer;
+import org.approvaltests.reporters.DiffReporter;
+import org.approvaltests.reporters.UseReporter;
+import org.approvaltests.writers.ApprovalTextWriter;
+import org.assertj.core.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+
+import static org.approvaltests.Approvals.getReporter;
+import static org.approvaltests.Approvals.verify;
+
+public class LockDownMavenDeps_Test {
+
+ @BeforeEach
+ public void setUp() throws Exception {
+ Assumptions.assumeThat(System.getProperty("lockdown")).isNotNull();
+ }
+
+ @UseReporter(DiffReporter.class)
+ @Test
+ public void list() throws Exception {
+ final String variant = "list";
+ final String received = sort(read(variant));
+ verify(approvalTextWriter(received, "txt"), namerFor(variant), getReporter());
+ }
+
+ @UseReporter(DiffReporter.class)
+ @Test
+ public void tree() throws Exception {
+ final String variant = "tree";
+ final String received = read(variant);
+ verify(approvalTextWriter(received, "txt"), namerFor(variant), getReporter());
+ }
+
+ private static ApprovalTextWriter approvalTextWriter(final String received, final String fileExtensionWithoutDot) {
+ return new ReceivedVsApprovedApprovalTextWriter(received, fileExtensionWithoutDot);
+ }
+
+ private StackTraceNamer namerFor(String variant) {
+ return new StackTraceNamer() {
+ @Override
+ public String getApprovalName() {
+ return "LockDownMavenDeps_Test." + variant;
+ }
+ };
+ }
+
+ private String read(final String goal) throws IOException {
+ final URL resource = Resources.getResource(getClass(),
+ String.format("received/%s.%s.txt", getClass().getSimpleName(), goal));
+ return Resources.toString(resource, Charsets.UTF_8);
+ }
+
+ private static String sort(final String unsorted) {
+ final String[] lines = unsorted.split("[\r\n]+");
+ Arrays.sort(lines);
+ return String.join("\n", lines);
+ }
+
+}
diff --git a/webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.list.approved.txt b/webapp/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/approved/LockDownMavenDeps_Test.list.txt
similarity index 100%
rename from webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.list.approved.txt
rename to webapp/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/approved/LockDownMavenDeps_Test.list.txt
diff --git a/webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.tree.approved.txt b/webapp/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/approved/LockDownMavenDeps_Test.tree.txt
similarity index 100%
rename from webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.tree.approved.txt
rename to webapp/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/approved/LockDownMavenDeps_Test.tree.txt
index 07973d3..0b5d7b1 100644
--- a/webapp/src/test/java/domainapp/webapp/lockdown/LockDownMavenDeps_Test.tree.approved.txt
+++ b/webapp/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/approved/LockDownMavenDeps_Test.tree.txt
@@ -148,6 +148,18 @@ org.apache.isis.examples.apps:simpleapp-webapp:jar:2.0.0-M3-SNAPSHOT
| +- com.google.j2objc:j2objc-annotations:jar:1.3:compile
| \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.18:compile
+- org.apache.isis.mavendeps:isis-mavendeps-jdk11:pom:2.0.0-M3-SNAPSHOT:compile
++- org.springframework.boot:spring-boot-actuator-autoconfigure:jar:2.2.1.RELEASE:compile
+| +- org.springframework.boot:spring-boot-actuator:jar:2.2.1.RELEASE:compile
+| | \- org.springframework.boot:spring-boot:jar:2.2.1.RELEASE:compile
+| +- org.springframework.boot:spring-boot-autoconfigure:jar:2.2.1.RELEASE:compile
+| +- com.fasterxml.jackson.core:jackson-databind:jar:2.10.0:compile
+| +- org.springframework:spring-core:jar:5.2.1.RELEASE:compile
+| | \- org.springframework:spring-jcl:jar:5.2.1.RELEASE:compile
+| +- org.springframework:spring-context:jar:5.2.1.RELEASE:compile
+| | +- org.springframework:spring-aop:jar:5.2.1.RELEASE:compile
+| | +- org.springframework:spring-beans:jar:5.2.1.RELEASE:compile
+| | \- org.springframework:spring-expression:jar:5.2.1.RELEASE:compile
+| \- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.10.0:compile
+- com.h2database:h2:jar:1.4.200:compile
+- org.apache.isis.mavendeps:isis-mavendeps-testing:pom:2.0.0-M3-SNAPSHOT:test
| +- org.apache.isis.core:isis-unittestsupport:jar:2.0.0-M3-SNAPSHOT:test
@@ -209,16 +221,4 @@ org.apache.isis.examples.apps:simpleapp-webapp:jar:2.0.0-M3-SNAPSHOT
| | \- io.cucumber:datatable-dependencies:jar:1.1.14:test
| +- io.cucumber:cucumber-spring:jar:4.8.0:test
| \- io.cucumber:cucumber-junit:jar:4.8.0:test
-+- org.springframework.boot:spring-boot-actuator-autoconfigure:jar:2.2.1.RELEASE:compile
-| +- org.springframework.boot:spring-boot-actuator:jar:2.2.1.RELEASE:compile
-| | \- org.springframework.boot:spring-boot:jar:2.2.1.RELEASE:compile
-| +- org.springframework.boot:spring-boot-autoconfigure:jar:2.2.1.RELEASE:compile
-| +- com.fasterxml.jackson.core:jackson-databind:jar:2.10.0:compile
-| +- org.springframework:spring-core:jar:5.2.1.RELEASE:compile
-| | \- org.springframework:spring-jcl:jar:5.2.1.RELEASE:compile
-| +- org.springframework:spring-context:jar:5.2.1.RELEASE:compile
-| | +- org.springframework:spring-aop:jar:5.2.1.RELEASE:compile
-| | +- org.springframework:spring-beans:jar:5.2.1.RELEASE:compile
-| | \- org.springframework:spring-expression:jar:5.2.1.RELEASE:compile
-| \- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.10.0:compile
\- org.projectlombok:lombok:jar:1.18.10:provided
diff --git a/webapp/src/test/java/domainapp/webapp/lockdown/received/.gitignore b/webapp/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/received/.gitignore
similarity index 100%
rename from webapp/src/test/java/domainapp/webapp/lockdown/received/.gitignore
rename to webapp/src/test/java/domainapp/webapp/unittests/mavendeps/lockdown/received/.gitignore
diff --git a/webapp/src/test/java/domainapp/webapp/util/ReceivedVsApprovedApprovalTextWriter.java b/webapp/src/test/java/domainapp/webapp/util/ReceivedVsApprovedApprovalTextWriter.java
new file mode 100644
index 0000000..b00f6b2
--- /dev/null
+++ b/webapp/src/test/java/domainapp/webapp/util/ReceivedVsApprovedApprovalTextWriter.java
@@ -0,0 +1,35 @@
+package domainapp.webapp.util;
+
+import java.io.File;
+
+import org.approvaltests.writers.ApprovalTextWriter;
+
+public class ReceivedVsApprovedApprovalTextWriter extends ApprovalTextWriter {
+
+ private final String fileExtensionWithoutDot;
+
+ public ReceivedVsApprovedApprovalTextWriter(String received, String fileExtensionWithoutDot) {
+ super(received, fileExtensionWithoutDot);
+ this.fileExtensionWithoutDot = fileExtensionWithoutDot;
+ }
+
+ @Override
+ public String getReceivedFilename(final String base) {
+ return toFilename("received", base);
+ }
+
+ @Override
+ public String getApprovalFilename(final String base) {
+ return toFilename("approved", base);
+ }
+
+ private String toFilename(final String prefix, final String base) {
+ final File file = new File(base);
+ final File parentFile = file.getParentFile();
+ final String localName = file.getName();
+ final File newDir = new File(parentFile, prefix);
+ final File newFile = new File(newDir, localName + "." + fileExtensionWithoutDot);
+ return newFile.toString();
+ }
+
+}