You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/01/16 22:33:10 UTC
[isis] branch v2 updated (b88325b -> 89b096f)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from b88325b Merge branch 'master' into v2
add 0b83fa7 ISIS-1811: bumps revision property across all pom.xml's to 2.0.0-M2
add 75262f8 ISIS-1811: adds missing license headers
add 981e96e ISIS-1811: copies over fixes to scripts from master branch
add f28a485 ISIS-1811: recreating simpleapp archetype
add 7d4ee2d ISIS-1811: recreating helloworld archetype
add 32a4d24 ISIS-1811: bumps revision property across all ...
add 3d7dc23 ISIS-1811 fixes tests by setting environment flag unit-testing=true
add 87cb881 ISIS-1290: adds profile for webdocker
add e63c460 Merge branch 'master' into release-2.0.0-M2-RC1
add 4b8a6f9 ISIS-1811: bumps revision property across all pom.xml's to 2.0.0-M2
add c20f97f ISIS-1811: recreating simpleapp archetype
add d529233 ISIS-1811: recreating helloworld archetype
add 89b096f Revert "ISIS-1811: bumps revision property across all pom.xml's to 2.0.0-M2"
No new revisions were added by this update.
Summary of changes:
...rvicesInjectorDefaultTest_validateServices.java | 3 +
core/pom.xml | 2 +-
core/webdocker/pom.xml | 48 +
core/webserver/config/isis.properties | 16 +
.../isis/core/webserver/DummyAppManifest.java | 18 +
.../core/webserver/HelloWorldAppConfigTest.java | 18 +
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
example/archetype/helloworld/pom.xml | 10 +-
.../appended-resources/supplemental-models.xml | 26 +
.../META-INF/maven/archetype-metadata.xml | 11 +-
.../src/main/resources/archetype-resources/pom.xml | 62 +-
.../org.apache.isis.core.commons.config.AppConfig | 0
.../application/HelloWorldAppManifest.java | 11 +-
.../application/isis-non-changing.properties | 4 +-
.../java/domainapp/application/menubars.layout.xml | 11 +-
.../java/domainapp/dom/impl/HelloWorldObjects.java | 20 +-
.../src/main/webapp/WEB-INF/isis.properties | 12 +-
.../src/main/webapp/WEB-INF/logging.properties | 6 +-
.../src/main/webapp/WEB-INF/web.xml | 296 +--
.../src/main/webapp/about/index.html | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
.../archetype/{helloworld => simpleapp}/pom.xml | 22 +-
.../appended-resources/supplemental-models.xml | 26 +
.../META-INF/maven/archetype-metadata.xml | 181 ++
.../resources/archetype-resources}/.gitlab-ci.yml | 0
.../resources/archetype-resources/.m2/settings.xml | 23 +
.../resources/archetype-resources}/README.adoc | 0
.../archetype-resources/_checks/checkstyle.xml | 290 +++
.../resources/archetype-resources/_checks/pmd.xml | 49 +
.../application/logging-integtest.properties | 124 +
.../archetype-resources/application/pom.xml | 131 +
.../application/DomainAppApplicationModule.java} | 26 +-
...mainAppFixtureScriptsSpecificationProvider.java | 48 +
.../fixture/scenarios/DomainAppDemo.java} | 33 +-
.../manifest/DomainAppAppManifest.java} | 12 +-
.../DomainAppAppManifestBypassSecurity.java} | 21 +-
.../DomainAppAppManifestWithFixtures.java} | 23 +-
...nAppAppManifestWithFixturesBypassSecurity.java} | 20 +-
.../manifest/isis-non-changing.properties | 741 ++++++
.../application/manifest}/menubars.layout.xml | 21 +-
.../services/health/HealthCheckServiceImpl.java | 32 +
.../services/homepage/HomePageService.java} | 35 +-
.../services/homepage/HomePageViewModel.java} | 34 +-
.../services/homepage/HomePageViewModel.layout.xml | 53 +
.../services/homepage/HomePageViewModel.png | Bin
.../bdd/specglue/BootstrappingGlue.java | 42 +
.../bdd/specglue/BootstrappingGlueAbstract.java | 40 +
.../bdd/specglue/CatalogOfFixturesGlue.java | 32 +
.../application/bdd/specs/RunIntegBddSpecs.java | 46 +
.../SimpleObjectSpec_listAllAndCreate.feature | 0
.../integtests/DomainAppIntegTestAbstract.java} | 21 +-
.../integtests/mml/MetaModelService_IntegTest.java | 150 ++
...omainAppFixtureScriptsSpecificationProvider.xml | 48 +
...application.fixture.scenarios.DomainAppDemo.xml | 270 ++
...tion.services.health.HealthCheckServiceImpl.xml | 48 +
...plication.services.homepage.HomePageService.xml | 47 +
...ication.services.homepage.HomePageViewModel.xml | 352 +++
...ainapp.modules.simple.dom.impl.SimpleObject.xml | 878 +++++++
...inapp.modules.simple.dom.impl.SimpleObjects.xml | 270 ++
....apache.isis.applib.value.LocalResourcePath.xml | 5 +
.../integtests/smoke/Smoke_IntegTest.java | 100 +
...MetaModelService_IntegTest.exports.approved.xml | 2746 ++++++++++++++++++++
.../src/test/resources/cucumber.properties | 4 +
.../application/translations.pot} | 0
.../resources/archetype-resources}/enhance-all.sh | 0
.../module-simple/build.gradle | 0
.../archetype-resources}/module-simple/gradlew | 0
.../archetype-resources}/module-simple/gradlew.bat | 0
.../module-simple/layouts.gradle | 0
.../module-simple/liveReload.gradle | 0
.../module-simple}/logging-dn-enhance.properties | 0
.../module-simple/logging-integtest.properties | 123 +
.../archetype-resources/module-simple/pom.xml | 202 ++
.../src/main/java/META-INF/persistence.xml | 29 +
.../domainapp/modules/simple/SimpleModule.java | 51 +
.../modules/simple/SimpleModuleManifest.java} | 20 +-
.../modules/simple/dom/impl/SimpleObject.java | 111 +
.../simple/dom/impl/SimpleObject.layout.xml | 71 +
.../modules/simple/dom/impl/SimpleObject.png | Bin
.../modules/simple/dom/impl/SimpleObjects.java | 100 +
.../domainapp/modules/simple/dom/types/Name.java | 39 +
.../domainapp/modules/simple/dom/types/Notes.java | 28 +
.../simple/fixture/SimpleObjectBuilder.java} | 38 +-
.../simple/fixture/SimpleObject_persona.java | 66 +
.../modules/simple/dom/impl/SimpleObject_Test.java | 53 +
.../simple/dom/impl/SimpleObjects_Test.java | 119 +
.../integtests/SimpleModuleIntegTestAbstract.java} | 22 +-
.../integtests/tests/SimpleObject_IntegTest.java | 153 ++
.../integtests/tests/SimpleObjects_IntegTest.java | 133 +
.../modules/simple/specglue/SimpleObjectsGlue.java | 52 +
.../module-simple/translations.pot} | 0
.../main/resources/archetype-resources}/pom.xml | 42 +-
.../resources/archetype-resources/webapp}/pom.xml | 236 +-
.../webapp/src/main/jettyconsole/isis-banner.pdn | Bin
.../webapp/src/main/jettyconsole/isis-banner.png | Bin
.../src/main/webapp/WEB-INF/isis.properties | 91 +-
.../src/main/webapp/WEB-INF/logging.properties | 18 +-
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 0
.../src/main/webapp/WEB-INF/translations-en.po | 0
.../src/main/webapp/WEB-INF/translations-es.po | 0
.../src/main/webapp/WEB-INF/translations-nl.po | 0
.../webapp/src/main/webapp/WEB-INF/translations.po | 0
.../webapp/src/main/webapp/WEB-INF/web.xml | 52 +
.../src/main/webapp/about/images/isis-logo.png | Bin
.../webapp}/src/main/webapp/about/index.html | 18 +-
.../webapp}/src/main/webapp/css/application.css | 0
.../main/webapp/images/apache-isis/logo-48x48.png | Bin
.../webapp}/src/main/webapp/scripts/application.js | 0
.../resources/projects/basic/archetype.properties | 2 +-
.../src/test/resources/projects/basic/goal.txt | 0
scripts/recreate-archetype.sh | 4 +-
scripts/updateGeneratedArchetypeSources.groovy | 140 +-
113 files changed, 8836 insertions(+), 803 deletions(-)
create mode 100644 example/archetype/helloworld/src/main/appended-resources/supplemental-models.xml
copy example/{application/helloworld => archetype/helloworld/src/main/resources/archetype-resources}/src/main/java/META-INF/services/org.apache.isis.core.commons.config.AppConfig (100%)
copy example/archetype/{helloworld => simpleapp}/pom.xml (85%)
create mode 100644 example/archetype/simpleapp/src/main/appended-resources/supplemental-models.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/.gitlab-ci.yml (100%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/.m2/settings.xml
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/README.adoc (100%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/_checks/checkstyle.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/_checks/pmd.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/logging-integtest.properties
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml
copy example/archetype/{helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/HelloWorldAppManifest.java => simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/DomainAppApplicationModule.java} (64%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
copy example/archetype/{helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/HelloWorldAppManifest.java => simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java} (51%)
copy example/archetype/{helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/HelloWorldAppManifest.java => simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java} (77%)
copy example/archetype/{helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/HelloWorldAppManifest.java => simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestBypassSecurity.java} (62%)
copy example/archetype/{helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/HelloWorldAppManifest.java => simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixtures.java} (63%)
copy example/archetype/{helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/HelloWorldAppManifest.java => simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/DomainAppAppManifestWithFixturesBypassSecurity.java} (62%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest/isis-non-changing.properties
copy example/archetype/{helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application => simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/manifest}/menubars.layout.xml (89%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/health/HealthCheckServiceImpl.java
copy example/archetype/{helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/HelloWorldAppManifest.java => simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/homepage/HomePageService.java} (53%)
copy example/archetype/{helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/HelloWorldAppManifest.java => simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java} (53%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.layout.xml
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.png (100%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specglue/BootstrappingGlue.java
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specglue/BootstrappingGlueAbstract.java
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specglue/CatalogOfFixturesGlue.java
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specs/RunIntegBddSpecs.java
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/application/src/test/java/domainapp/application/bdd/specs/SimpleObjectSpec_listAllAndCreate.feature (100%)
copy example/archetype/{helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/HelloWorldAppManifest.java => simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/integtests/DomainAppIntegTestAbstract.java} (62%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/integtests/mml/MetaModelService_IntegTest.java
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.scenarios.DomainAppDemo.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.health.HealthCheckServiceImpl.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageService.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.value.LocalResourcePath.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/integtests/smoke/Smoke_IntegTest.java
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/integtests/tests/mml/MetaModelService_IntegTest.exports.approved.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/resources/cucumber.properties
copy example/archetype/{helloworld/src/test/resources/projects/basic/goal.txt => simpleapp/src/main/resources/archetype-resources/application/translations.pot} (100%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/enhance-all.sh (100%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/module-simple/build.gradle (100%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/module-simple/gradlew (100%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/module-simple/gradlew.bat (100%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/module-simple/layouts.gradle (100%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/module-simple/liveReload.gradle (100%)
copy example/archetype/{helloworld/src/main/resources/archetype-resources => simpleapp/src/main/resources/archetype-resources/module-simple}/logging-dn-enhance.properties (100%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/logging-integtest.properties
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/META-INF/persistence.xml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
copy example/archetype/{helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/HelloWorldAppManifest.java => simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/SimpleModuleManifest.java} (63%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.png (100%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/types/Name.java
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/types/Notes.java
copy example/archetype/{helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/HelloWorldAppManifest.java => simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java} (55%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjects_Test.java
copy example/archetype/{helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/HelloWorldAppManifest.java => simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java} (62%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/test/java/domainapp/modules/simple/specglue/SimpleObjectsGlue.java
copy example/archetype/{helloworld/src/test/resources/projects/basic/goal.txt => simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot} (100%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/pom.xml (83%)
copy example/{application/helloworld => archetype/simpleapp/src/main/resources/archetype-resources/webapp}/pom.xml (52%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/webapp/src/main/jettyconsole/isis-banner.pdn (100%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/webapp/src/main/jettyconsole/isis-banner.png (100%)
copy example/archetype/{helloworld/src/main/resources/archetype-resources => simpleapp/src/main/resources/archetype-resources/webapp}/src/main/webapp/WEB-INF/isis.properties (61%)
copy example/archetype/{helloworld/src/main/resources/archetype-resources => simpleapp/src/main/resources/archetype-resources/webapp}/src/main/webapp/WEB-INF/logging.properties (94%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/webapp/src/main/webapp/WEB-INF/shiro.ini (100%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/webapp/src/main/webapp/WEB-INF/translations-en.po (100%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/webapp/src/main/webapp/WEB-INF/translations-es.po (100%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/webapp/src/main/webapp/WEB-INF/translations-nl.po (100%)
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/webapp/src/main/webapp/WEB-INF/translations.po (100%)
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
copy example/archetype/{helloworld/src/main/resources/archetype-resources => simpleapp/src/main/resources/archetype-resources/webapp}/src/main/webapp/about/images/isis-logo.png (100%)
copy example/archetype/{helloworld/src/main/resources/archetype-resources => simpleapp/src/main/resources/archetype-resources/webapp}/src/main/webapp/about/index.html (56%)
copy example/archetype/{helloworld/src/main/resources/archetype-resources => simpleapp/src/main/resources/archetype-resources/webapp}/src/main/webapp/css/application.css (100%)
copy example/archetype/{helloworld/src/main/resources/archetype-resources => simpleapp/src/main/resources/archetype-resources/webapp}/src/main/webapp/images/apache-isis/logo-48x48.png (100%)
copy example/archetype/{helloworld/src/main/resources/archetype-resources => simpleapp/src/main/resources/archetype-resources/webapp}/src/main/webapp/scripts/application.js (100%)
copy example/archetype/{helloworld => simpleapp}/src/test/resources/projects/basic/archetype.properties (71%)
copy example/archetype/{helloworld => simpleapp}/src/test/resources/projects/basic/goal.txt (100%)